diff options
| author | Stefan Monnier | 2014-05-13 16:34:12 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-05-13 16:34:12 -0400 |
| commit | 27a69ff0e846a72f6f37fd1155facd1232cce8ed (patch) | |
| tree | 3b0e8b91e26b6b071b91bb0436f9fb20e1c5d370 | |
| parent | d3e5c0ea8f4c5902a11b6bc36170336a7a7f01b6 (diff) | |
| download | emacs-27a69ff0e846a72f6f37fd1155facd1232cce8ed.tar.gz emacs-27a69ff0e846a72f6f37fd1155facd1232cce8ed.zip | |
* lisp/simple.el (undo-make-selective-list): Obey undo-no-redo.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 3 |
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 @@ | |||
| 1 | 2014-05-13 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * simple.el (undo-make-selective-list): Obey undo-no-redo. | ||
| 4 | |||
| 1 | 2014-05-12 Sam Steingold <sds@gnu.org> | 5 | 2014-05-12 Sam Steingold <sds@gnu.org> |
| 2 | 6 | ||
| 3 | * calendar/time-date.el (seconds-to-string): New function to | 7 | * 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." | |||
| 2437 | undo-deltas | 2437 | undo-deltas |
| 2438 | undo-elt) | 2438 | undo-elt) |
| 2439 | (while ulist | 2439 | (while ulist |
| 2440 | (when undo-no-redo | ||
| 2441 | (while (gethash ulist undo-equiv-table) | ||
| 2442 | (setq ulist (gethash ulist undo-equiv-table)))) | ||
| 2440 | (setq undo-elt (car ulist)) | 2443 | (setq undo-elt (car ulist)) |
| 2441 | (cond | 2444 | (cond |
| 2442 | ((null undo-elt) | 2445 | ((null undo-elt) |