procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/simple.el (undo): Tweak message in undo-only case.

Browse source 
Fixes: debbugs:12283
This commit is contained in:
Glenn Morris 2012-09-01 17:56:03 -07:00
parent 69678719ec
commit d67d3afd3a
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2012-09-02 Glenn Morris <rgm@gnu.org>
* simple.el (undo): Tweak message in undo-only case. (Bug#12283)
2012-09-01 Glenn Morris <rgm@gnu.org>
* term.el: Tidy up menu definitions.

7
lisp/simple.el
View file

@ -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.