* 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdc40f44a2de0f22483a66dc6c840631e8ca5ac8..f7b3c7a1c2cecac4fb612280537a30ca867eb5c9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/simple.el b/lisp/simple.el
index ea70e6cbd0687ff9be85c430f2a38a56aa8081ec..b126637904ec4244668f5d6c1f715aa4efb74dd5 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5490,12 +5490,12 @@ cancel the use of the current buffer (for special-purpose buffers),
 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