Mercurial > emacs
changeset 77917:32e17b491f4f
(bs-cycle-previous): Don't modify the cycle list until
`switch-to-buffer' has returned succesfully.
(bs-cycle-next): Ditto. Also, don't bury the buffer when the
window is dedicated (it could iconify the frame).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 05 Jun 2007 15:59:15 +0000 |
| parents | 552e43e7efe5 |
| children | 80ba9b48c547 |
| files | lisp/bs.el |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/bs.el Tue Jun 05 15:58:40 2007 +0000 +++ b/lisp/bs.el Tue Jun 05 15:59:15 2007 +0000 @@ -1221,10 +1221,13 @@ bs--cycle-list))) (next (car tupel)) (cycle-list (cdr tupel))) + (unless (window-dedicated-p (selected-window)) + ;; We don't want the frame iconified if the only window in the frame + ;; happens to be dedicated; let's get the error from switch-to-buffer + (bury-buffer)) + (switch-to-buffer next) (setq bs--cycle-list (append (cdr cycle-list) (list (car cycle-list)))) - (bury-buffer) - (switch-to-buffer next) (bs-message-without-log "Next buffers: %s" (or (cdr bs--cycle-list) "this buffer")))))) @@ -1251,9 +1254,9 @@ bs--cycle-list))) (prev-buffer (car tupel)) (cycle-list (cdr tupel))) + (switch-to-buffer prev-buffer) (setq bs--cycle-list (append (last cycle-list) (reverse (cdr (reverse cycle-list))))) - (switch-to-buffer prev-buffer) (bs-message-without-log "Previous buffers: %s" (or (reverse (cdr bs--cycle-list)) "this buffer"))))))