mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
Code Issues Releases Activity

Fix behavior when switch-to-prev-buffer-skip is a function (Bug#49275)

Browse Source 
* lisp/window.el (switch-to-prev-buffer)
(switch-to-next-buffer): More correctly handle cases where
'switch-to-prev-buffer-skip' is a function.
This commit is contained in:
pillule 2021-08-18 09:16:06 +02:00 committed by Martin Rudalics
parent 6d3455eb14
commit eddb003f30
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/window.el
View File

@ -4721,8 +4721,8 @@ This function is called by `prev-buffer'."
window new-buffer (nth 1 entry) (nth 2 entry))
(throw 'found t)))))
(when skipped
;; Show first skipped buffer.
(when (and skipped (not (functionp switch-to-prev-buffer-skip)))
;; Show first skipped buffer, unless skip was a function.
(setq new-buffer skipped)
(set-window-buffer-start-and-point window new-buffer)))
@ -4831,6 +4831,7 @@ This function is called by `next-buffer'."
;; nreverse here!)
(dolist (entry (reverse (window-prev-buffers window)))
(when (and (not (eq new-buffer (car entry)))
(not (eq old-buffer (car entry)))
(setq new-buffer (car entry))
(or (buffer-live-p new-buffer)
(not (setq killed-buffers
@ -4842,8 +4843,8 @@ This function is called by `next-buffer'."
window new-buffer (nth 1 entry) (nth 2 entry))
(throw 'found t))))
(when skipped
;; Show first skipped buffer.
(when (and skipped (not (functionp switch-to-prev-buffer-skip)))
;; Show first skipped buffer, unless skip was a function.
(setq new-buffer skipped)
(set-window-buffer-start-and-point window new-buffer)))