[Emacs-diffs] [emacs] 01/01: * src/frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003). * lisp/window.el (handle-select-window): Deactivate shift-region.

[Stefan Monnier]

monnier pushed a commit to branch emacs-24
in repository emacs.

commit 86790826398fa5e83853680899c8309890c7a766
Author: Stefan Monnier <address@hidden>
Date:   Sun Nov 16 00:30:12 2014 -0500

    * src/frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003).
    * lisp/window.el (handle-select-window): Deactivate shift-region.
---
 lisp/ChangeLog |    4 ++++
 lisp/window.el |    2 +-
 src/ChangeLog  |    4 ++++
 src/frame.c    |    2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4bebf2..ea9c8c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-16  Stefan Monnier  <address@hidden>
+
+       * window.el (handle-select-window): Deactivate shift-region (bug#19003).
+
 2014-11-15  Andreas Schwab  <address@hidden>
 
        * version.el (emacs-repository-get-version): Use git rev-parse
diff --git a/lisp/window.el b/lisp/window.el
index 7692c79..7d76649 100644
--- 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 4aa9958..f9f3a0f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-16  Stefan Monnier  <address@hidden>
+
+       * frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003).
+
 2014-11-15  Jan Djärv  <address@hidden>
 
         * nsterm.m (ns_send_appdefined): Check for application defined
diff --git a/src/frame.c b/src/frame.c
index e894d21..307119c 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