aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2005-04-13 17:40:53 +0000
committerRichard M. Stallman2005-04-13 17:40:53 +0000
commit0047373b7dbbf47d03c685700da366c5a686a275 (patch)
treeaaf61d6275767bf31f10fcc1fab86136292f435b
parent9c27debdf0aaece2a0d2c76cdbb477331f2e3c93 (diff)
downloademacs-0047373b7dbbf47d03c685700da366c5a686a275.tar.gz
emacs-0047373b7dbbf47d03c685700da366c5a686a275.zip
(undo): Fix previous change.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/simple.el2
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a525f67499d..e91a9adf10f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12005-04-13 Richard M. Stallman <rms@gnu.org>
2
3 * simple.el (undo): Fix previous change.
4
5 * custom.el (defface): Doc fix.
6
12005-04-13 Lute Kamstra <lute@gnu.org> 72005-04-13 Lute Kamstra <lute@gnu.org>
2 8
3 * Makefile.in (DONTCOMPILE): Remove list. 9 * Makefile.in (DONTCOMPILE): Remove list.
@@ -133,7 +139,7 @@
133 139
134 * dnd.el (dnd-protocol-alist): New file with generic DND functions. 140 * dnd.el (dnd-protocol-alist): New file with generic DND functions.
135 141
1362005-04-11 Stefan Monnier <monnier@iro.umontreal.ca> 1422005-04-11 JUAN-LEON Lahoz Garcia <juanleon1@gmail.com>
137 143
138 * wdired.el: Doc fixes. 144 * wdired.el: Doc fixes.
139 (wdired-confirm-overwrite): Rename from wdired-is-ok-overwrite. 145 (wdired-confirm-overwrite): Rename from wdired-is-ok-overwrite.
diff --git a/lisp/simple.el b/lisp/simple.el
index 1bb090071eb..3b3a3acb466 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1341,7 +1341,7 @@ as an argument limits undo to changes within the current region."
1341 (message (if undo-in-region 1341 (message (if undo-in-region
1342 (if equiv "Redo in region!" "Undo in region!") 1342 (if equiv "Redo in region!" "Undo in region!")
1343 (if equiv "Redo!" "Undo!")))) 1343 (if equiv "Redo!" "Undo!"))))
1344 (when (and (listp equiv) undo-no-redo) 1344 (when (and (consp equiv) undo-no-redo)
1345 ;; The equiv entry might point to another redo record if we have done 1345 ;; The equiv entry might point to another redo record if we have done
1346 ;; undo-redo-undo-redo-... so skip to the very last equiv. 1346 ;; undo-redo-undo-redo-... so skip to the very last equiv.
1347 (while (let ((next (gethash equiv undo-equiv-table))) 1347 (while (let ((next (gethash equiv undo-equiv-table)))