[Emacs-diffs] Changes to emacs/src/callint.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/04/03 16:36:47

Index: callint.c
===================================================================
RCS file: /sources/emacs/emacs/src/callint.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- callint.c   2 Apr 2008 20:14:40 -0000       1.165
+++ callint.c   3 Apr 2008 16:36:47 -0000       1.166
@@ -36,6 +36,7 @@
 
 extern Lisp_Object Qcursor_in_echo_area;
 extern Lisp_Object Qfile_directory_p;
+extern Lisp_Object Qonly;
 
 Lisp_Object Vcurrent_prefix_arg, Qminus, Qplus;
 Lisp_Object Qcall_interactively;
@@ -454,7 +455,13 @@
       else if (*string == '^')
        {
          if (! NILP (Vshift_select_mode))
-           call0 (Qhandle_shift_selection);
+           call1 (Qhandle_shift_selection, Qnil);
+         /* Even if shift-select-mode is off, temporarily active
+            regions could be set using the mouse, and should be
+            deactivated.  */
+         else if (CONSP (Vtransient_mark_mode)
+                  && EQ (XCAR (Vtransient_mark_mode), Qonly))
+           call1 (Qhandle_shift_selection, Qt);
          string++;
        }
       else break;