[Emacs-diffs] /srv/bzr/emacs/trunk r99792: * simple.el (keyboard-escape-quit): Raise deselecting the active

[Juri Linkov]

------------------------------------------------------------
revno: 99792
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2010-03-31 18:02:53 +0300
message:
  * 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
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-31 14:55:01 +0000
+++ b/lisp/ChangeLog    2010-03-31 15:02:53 +0000
@@ -1,5 +1,11 @@
 2010-03-31  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * image.el (image-animated-p): Use `image-metadata' instead of
        `image-extension-data'.  Get GIF extenstion data from metadata
        property `extension-data'.

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2010-03-31 02:53:53 +0000
+++ b/lisp/simple.el    2010-03-31 15:02:53 +0000
@@ -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