changeset 107720:f0a2ddb8569a

* simple.el (keyboard-escape-quit): Raise deselecting the active region higher than exiting the minibuffer. http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00904.html
author Juri Linkov <juri@jurta.org>
date Wed, 31 Mar 2010 18:02:53 +0300
parents 9c0ed2d6731a
children 9b2eadc063cc
files lisp/ChangeLog lisp/simple.el
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Mar 31 17:55:01 2010 +0300
+++ b/lisp/ChangeLog	Wed Mar 31 18:02:53 2010 +0300
@@ -1,3 +1,9 @@
+2010-03-31  Juri Linkov  <juri@jurta.org>
+
+	* simple.el (keyboard-escape-quit): Raise deselecting the active
+	region higher than exiting the minibuffer.
+	http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00904.html
+
 2010-03-31  Juri Linkov  <juri@jurta.org>
 
 	* image.el (image-animated-p): Use `image-metadata' instead of
--- a/lisp/simple.el	Wed Mar 31 17:55:01 2010 +0300
+++ b/lisp/simple.el	Wed Mar 31 18:02:53 2010 +0300
@@ -5490,12 +5490,12 @@
 or go back to just one window (by deleting all but the selected window)."
   (interactive)
   (cond ((eq last-command 'mode-exited) nil)
+	((region-active-p)
+	 (deactivate-mark))
 	((> (minibuffer-depth) 0)
 	 (abort-recursive-edit))
 	(current-prefix-arg
 	 nil)
-	((region-active-p)
-	 (deactivate-mark))
 	((> (recursion-depth) 0)
 	 (exit-recursive-edit))
 	(buffer-quit-function