From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 28 Aug 2023 16:12:42 +0000 (-0400)
Subject: * lisp/subr.el (combine-change-calls-1): Fix bug#64989
X-Git-Tag: emacs-29.1.90~165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f26622b2a47;p=emacs.git

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

Silence the spurious warning, and improve the warning while at it.
Do not merge to master.
---

diff --git a/lisp/subr.el b/lisp/subr.el
index 28473f1d38c..3ad57eeef2a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -5002,8 +5002,8 @@ the function `undo--wrap-and-run-primitive-undo'."
 			;; 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"))
+		  (unless (or (cdr ptr) (null old-bul))
+		    (message "combine-change-calls: buffer-undo-list presumably truncated by GC"))
 		  (setcdr ptr nil)
 		  (push ap-elt buffer-undo-list)
 		  (setcdr buffer-undo-list old-bul)))))