[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/04/02 20:17:20

Index: cua-base.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/cua-base.el,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- cua-base.el 19 Mar 2008 01:05:50 -0000      1.93
+++ cua-base.el 2 Apr 2008 20:17:20 -0000       1.94
@@ -1579,12 +1579,14 @@
          (list
           transient-mark-mode
           (and (boundp 'delete-selection-mode) delete-selection-mode)
-          (and (boundp 'pc-selection-mode) pc-selection-mode)))
+          (and (boundp 'pc-selection-mode) pc-selection-mode)
+          shift-select-mode))
     (if (and (boundp 'delete-selection-mode) delete-selection-mode)
        (delete-selection-mode -1))
     (if (and (boundp 'pc-selection-mode) pc-selection-mode)
        (pc-selection-mode -1))
     (cua--deactivate)
+    (setq shift-select-mode nil)
     (setq transient-mark-mode (and cua-mode
                                   (if cua-highlight-region-shift-only
                                       (not cua--explicit-region-start)
@@ -1595,6 +1597,7 @@
        (delete-selection-mode 1))
     (if (nth 2 cua--saved-state)
        (pc-selection-mode 1))
+    (setq shift-select-mode (nth 3 cua--saved-state))
     (if (interactive-p)
        (message "CUA mode disabled.%s%s%s%s"
                 (if (nth 1 cua--saved-state) " Delete-Selection" "")