procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/subr.el (combine-change-calls-1): Fix bug#60467

Browse source 
Don't stop at timestamps.  Strip them for now, to be on the safe side.
Don't merge into `master` where we'll use a better fix.
This commit is contained in:
Stefan Monnier 2023-01-13 17:38:04 -05:00
parent 9f8f8ed1ba
commit 59c3c53efa
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/subr.el
View file

@ -4946,13 +4946,13 @@ the function `undo--wrap-and-run-primitive-undo'."
(progn
(while (and (not (eq (cdr ptr) old-bul))
;; In case garbage collection has removed OLD-BUL.
(cdr ptr)
;; Don't include a timestamp entry.
(not (and (consp (cdr ptr))
(consp (cadr ptr))
(eq (caadr ptr) t)
(setq old-bul (cdr ptr)))))
(setq ptr (cdr ptr)))
(cdr ptr))
(if (and (consp (cdr ptr))
(consp (cadr ptr))
(eq (caadr ptr) t))
;; Don't include a timestamp entry.
(setcdr ptr (cddr ptr))
(setq ptr (cdr ptr))))
(unless (cdr ptr)
(message "combine-change-calls: buffer-undo-list broken"))
(setcdr ptr nil)