[Emacs-diffs] emacs-24 r116860: Addendum to: Undo in region after markers in undo history relocated

[Barry O'Reilly]

------------------------------------------------------------
revno: 116860
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16818
committer: Barry O'Reilly <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-03-25 19:30:08 -0400
message:
  Addendum to: Undo in region after markers in undo history relocated
  
  * simple.el (primitive-undo): Correction to 2014-03-24 change.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-25 09:49:37 +0000
+++ b/lisp/ChangeLog    2014-03-25 23:30:08 +0000
@@ -1,3 +1,7 @@
+2014-03-25  Barry O'Reilly  <address@hidden>
+
+       * simple.el (primitive-undo): Correction to 2014-03-24 change.
+
 2014-03-25  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-methods, tramp-connection-timeout): Fix docstring.

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2014-03-25 02:47:39 +0000
+++ b/lisp/simple.el    2014-03-25 23:30:08 +0000
@@ -2321,9 +2321,10 @@
            ;; 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,