2 files changed, 8 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 244b1f6a158..e0a02b39dc0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * callint.c (Fcall_interactively): For '^' just delegate the work to
+        handle-shift-selection.
+        (syms_of_callint): Move declaration of shift-select-mode to simple.el.
+
 2009-03-24  Chong Yidong  <cyd@stupidchicken.com>
 
         * editfns.c (Ffloat_time): Doc fix (Bug#2768).
diff --git a/src/callint.c b/src/callint.c
index 10f5f63c864..3641fbc5b77 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -51,7 +51,7 @@ extern Lisp_Object Qface, Qminibuffer_prompt;
    even if mark_active is 0.  */
 Lisp_Object Vmark_even_if_inactive;
 
-Lisp_Object Vshift_select_mode, Qhandle_shift_selection;
+Lisp_Object Qhandle_shift_selection;
 
 Lisp_Object Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook;
 
@@ -454,14 +454,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
         }
       else if (*string == '^')
         {
-          if (! NILP (Vshift_select_mode))
-            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);
+          call0 (Qhandle_shift_selection);
           string++;
         }
       else break;
@@ -994,20 +987,6 @@ turns off region highlighting, but commands that use the mark
 behave as if the mark were still active.  */);
   Vmark_even_if_inactive = Qt;
 
-  DEFVAR_LISP ("shift-select-mode", &Vshift_select_mode,
-               doc: /* When non-nil, shifted motion keys activate the mark momentarily.
-
-While the mark is activated in this way, any shift-translated point
-motion key extends the region, and if Transient Mark mode was off, it
-is temporarily turned on.  Furthermore, the mark will be deactivated
-by any subsequent point motion key that was not shift-translated, or
-by any action that normally deactivates the mark in Transient Mark
-mode.
-
-See `this-command-keys-shift-translated' for the meaning of
-shift-translation.  */);
-  Vshift_select_mode = Qt;
-
   DEFVAR_LISP ("mouse-leave-buffer-hook", &Vmouse_leave_buffer_hook,
                doc: /* Hook to run when about to switch windows with a mouse command.
 Its purpose is to give temporary modes such as Isearch mode