diff options
| author | Barry O'Reilly <gundaetiapo@gmail.com> | 2014-03-25 19:30:08 -0400 |
|---|---|---|
| committer | Barry O'Reilly <gundaetiapo@gmail.com> | 2014-03-25 19:30:08 -0400 |
| commit | 657e54f709cb435a5ca93f0184e214dd9e586f29 (patch) | |
| tree | 4eabee44f09e564bd8e825999e088d8116492abc /lisp | |
| parent | 75b7e407e8d4303930dbfad2df2f36b994f368ed (diff) | |
| download | emacs-657e54f709cb435a5ca93f0184e214dd9e586f29.tar.gz | |
Addendum to: Undo in region after markers in undo history relocated
* simple.el (primitive-undo): Correction to 2014-03-24 change.
Fixes: debbugs:16818
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e3a9a669e48..882bd4e19cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-03-25 Barry O'Reilly <gundaetiapo@gmail.com> + + * simple.el (primitive-undo): Correction to 2014-03-24 change. + 2014-03-25 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-methods, tramp-connection-timeout): Fix docstring. diff --git a/lisp/simple.el b/lisp/simple.el index 7be1f1f6399..98604a44de5 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2321,9 +2321,10 @@ Return what remains of the list." ;; Even though these elements are not expected in the undo ;; list, adjust them to be conservative for the 24.4 ;; release. (Bug#16818) - (set-marker marker - (- marker offset) - (marker-buffer marker))) + (when (marker-buffer marker) + (set-marker marker + (- marker offset) + (marker-buffer marker)))) (_ (error "Unrecognized entry in undo list %S" next)))) (setq arg (1- arg))) ;; Make sure an apply entry produces at least one undo entry, |