[Emacs-diffs] /srv/bzr/emacs/trunk r109846: * lisp/simple.el (undo): Tweak message in undo-only case.

[Glenn Morris]

------------------------------------------------------------
revno: 109846
fixes bug: http://debbugs.gnu.org/12283
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-01 17:56:03 -0700
message:
  * lisp/simple.el (undo): Tweak message in undo-only case.
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-01 22:03:06 +0000
+++ b/lisp/ChangeLog    2012-09-02 00:56:03 +0000
@@ -1,3 +1,7 @@
+2012-09-02  Glenn Morris  <address@hidden>
+
+       * simple.el (undo): Tweak message in undo-only case.  (Bug#12283)
+
 2012-09-01  Glenn Morris  <address@hidden>
 
        * term.el: Tidy up menu definitions.

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2012-08-30 17:09:11 +0000
+++ b/lisp/simple.el    2012-09-02 00:56:03 +0000
@@ -1886,9 +1886,10 @@
     ;; so, ask the user whether she wants to skip the redo/undo pair.
     (let ((equiv (gethash pending-undo-list undo-equiv-table)))
       (or (eq (selected-window) (minibuffer-window))
-         (setq message (if undo-in-region
-                           (if equiv "Redo in region!" "Undo in region!")
-                         (if equiv "Redo!" "Undo!"))))
+         (setq message (format "%s%s!"
+                                (if (or undo-no-redo (not equiv))
+                                    "Undo" "Redo")
+                                (if undo-in-region " in region" ""))))
       (when (and (consp equiv) undo-no-redo)
        ;; The equiv entry might point to another redo record if we have done
        ;; undo-redo-undo-redo-... so skip to the very last equiv.