From d67d3afd3a4ebe1c879ac7f3f8287b274b18d3ad Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 1 Sep 2012 17:56:03 -0700 Subject: [PATCH] * lisp/simple.el (undo): Tweak message in undo-only case. Fixes: debbugs:12283 --- lisp/ChangeLog | 4 ++++ lisp/simple.el | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42dda8f9e4..e849b7c02a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-09-02 Glenn Morris + + * simple.el (undo): Tweak message in undo-only case. (Bug#12283) + 2012-09-01 Glenn Morris * term.el: Tidy up menu definitions. diff --git a/lisp/simple.el b/lisp/simple.el index 51eb572dc5..b7a24f4f97 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1886,9 +1886,10 @@ as an argument limits undo to changes within the current region." ;; 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. -- 2.20.1