* src/frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003).

* lisp/window.el (handle-select-window): Deactivate shift-region.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4bebf2bee823e7dcb23b42c01bec338a35615a4..ea9c8c6b2cbdd174b56b3dfd36c71b6fa2fb4243 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * window.el (handle-select-window): Deactivate shift-region (bug#19003).
+
 2014-11-15  Andreas Schwab  <schwab@linux-m68k.org>
 
        * version.el (emacs-repository-get-version): Use git rev-parse

diff --git a/lisp/window.el b/lisp/window.el
index 7692c797afe5da74337a925fcc476d7cb4380b57..7d76649d7cfaa952d283236f1a6e8547ad8b46ee 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7715,7 +7715,7 @@ is active.  This function is run by `mouse-autoselect-window-timer'."
 
 (defun handle-select-window (event)
   "Handle select-window events."
-  (interactive "e")
+  (interactive "^e")
   (let ((window (posn-window (event-start event))))
     (unless (or (not (window-live-p window))
                ;; Don't switch if we're currently in the minibuffer.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4aa9958a52f3a28d4146147998a8ca98effa6fe2..f9f3a0f96b7b6f1325a9caa2c5f4ff216fd90d71 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003).
+
 2014-11-15  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (ns_send_appdefined): Check for application defined

diff --git a/src/frame.c b/src/frame.c
index e894d218df7e939014bd16dbafde041e40ebbff9..307119c44820246ed1ab7212620aa4b68f497aed 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -913,7 +913,7 @@ This function returns FRAME, or nil if FRAME has been deleted.  */)
   return do_switch_frame (frame, 1, 0, norecord);
 }
 
-DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e",
+DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "^e",
        doc: /* Handle a switch-frame event EVENT.
 Switch-frame events are usually bound to this function.
 A switch-frame event tells Emacs that the window manager has requested