From 86790826398fa5e83853680899c8309890c7a766 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 16 Nov 2014 00:30:12 -0500 Subject: [PATCH] * 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 a4bebf2bee8..ea9c8c6b2cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-16 Stefan Monnier + + * window.el (handle-select-window): Deactivate shift-region (bug#19003). + 2014-11-15 Andreas Schwab * version.el (emacs-repository-get-version): Use git rev-parse diff --git a/lisp/window.el b/lisp/window.el index 7692c797afe..7d76649d7cf 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 4aa9958a52f..f9f3a0f96b7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-16 Stefan Monnier + + * frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003). + 2014-11-15 Jan Djärv * 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 -- 2.39.5