# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1270047773 -10800
# Node ID f0a2ddb8569a9196ae40cf751a7e22fd0178ff83
# Parent  9c0ed2d6731a105b98bb0700ec5ff4d21adeedcf
* 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 -r 9c0ed2d6731a -r f0a2ddb8569a lisp/ChangeLog
--- 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
diff -r 9c0ed2d6731a -r f0a2ddb8569a lisp/simple.el
--- 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