From: Martin Rudalics Date: Thu, 1 Aug 2024 16:04:20 +0000 (+0200) Subject: Fix regression in 'todo-test-todo-quit02' X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4969d06e73f73667104c173bfbabcee8fb40b6a;p=emacs.git 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 ). (cherry picked from commit 0892b66e9b0233cf66d5f6d10bbd9bf096c41755) --- diff --git a/lisp/window.el b/lisp/window.el index 548c3baed92..cf1b8de7f1f 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4798,9 +4798,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