Fix regression in 'todo-test-todo-quit02'

* lisp/window.el (switch-to-prev-buffer): If BURY-OR-KILL is
non-nil, remove any 'quit-restore' or 'quit-restore-prev'
parameter referencing the old buffer too.  This fixes a
regression when running 'todo-test-todo-quit02' from 'ert'
(reported by Andrea Corallo <acorallo@gnu.org>).

1 files changed, 4 insertions, 3 deletions

diff --git a/lisp/window.el b/lisp/window.el
index 4687860db11..75c3b29b5dd 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4799,9 +4799,10 @@ This function is called by `previous-buffer'."
     (if bury-or-kill
         (let ((entry (and (eq bury-or-kill 'append)
                           (assq old-buffer (window-prev-buffers window)))))
-          ;; Remove `old-buffer' from WINDOW's previous and (restored list
-          ;; of) next buffers.
-          (unrecord-window-buffer window old-buffer)
+          ;; Remove `old-buffer' from WINDOW's previous and (restored
+          ;; list of) next buffers and also from its 'quit-restore' and
+          ;; 'quit-restore-prev' parameters.
+          (unrecord-window-buffer window old-buffer t)
           (when entry
             ;; Append old-buffer's entry to list of WINDOW's previous
             ;; buffers so it's less likely to get switched to soon but