diff options
| author | Stefan Monnier | 2023-08-28 12:12:42 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2023-08-28 12:12:42 -0400 |
| commit | f26622b2a470a6d9cfbabbaa96f6aa3966febf2f (patch) | |
| tree | 9001ca695cb5e7caeedb05eee9117a78e7edcf60 | |
| parent | 648a5e33e80417855b908693e36cba56cd2c796c (diff) | |
| download | emacs-f26622b2a470a6d9cfbabbaa96f6aa3966febf2f.tar.gz emacs-f26622b2a470a6d9cfbabbaa96f6aa3966febf2f.zip | |
* 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.
| -rw-r--r-- | lisp/subr.el | 4 |
1 files changed, 2 insertions, 2 deletions
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'." | |||
| 5002 | ;; Don't include a timestamp entry. | 5002 | ;; Don't include a timestamp entry. |
| 5003 | (setcdr ptr (cddr ptr)) | 5003 | (setcdr ptr (cddr ptr)) |
| 5004 | (setq ptr (cdr ptr)))) | 5004 | (setq ptr (cdr ptr)))) |
| 5005 | (unless (cdr ptr) | 5005 | (unless (or (cdr ptr) (null old-bul)) |
| 5006 | (message "combine-change-calls: buffer-undo-list broken")) | 5006 | (message "combine-change-calls: buffer-undo-list presumably truncated by GC")) |
| 5007 | (setcdr ptr nil) | 5007 | (setcdr ptr nil) |
| 5008 | (push ap-elt buffer-undo-list) | 5008 | (push ap-elt buffer-undo-list) |
| 5009 | (setcdr buffer-undo-list old-bul))))) | 5009 | (setcdr buffer-undo-list old-bul))))) |