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

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

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4aa9958a52f..f9f3a0f96b7 100644
--- 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 e894d218df7..307119c4482 100644
--- 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