summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el3
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e6013a839c..cd2ce4e8749 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-13 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * simple.el (undo-make-selective-list): Obey undo-no-redo.
+
2014-05-12 Sam Steingold <sds@gnu.org>
* calendar/time-date.el (seconds-to-string): New function to
diff --git a/lisp/simple.el b/lisp/simple.el
index 14843399869..af8e47c2383 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2437,6 +2437,9 @@ list can be applied to the current buffer."
undo-deltas
undo-elt)
(while ulist
+ (when undo-no-redo
+ (while (gethash ulist undo-equiv-table)
+ (setq ulist (gethash ulist undo-equiv-table))))
(setq undo-elt (car ulist))
(cond
((null undo-elt)