summaryrefslogtreecommitdiff
path: root/lisp/bs.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-07-13 21:40:30 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-07-13 21:40:30 -0400
commit8bdfa0649baea761588c1c9a741570689cecc66c (patch)
treee5d3b9239c1edca1a4a208099a6cb490395a2b02 /lisp/bs.el
parent5eba16a37cacff2065186df8cb6153ccaebae298 (diff)
downloademacs-8bdfa0649baea761588c1c9a741570689cecc66c.tar.gz
Adapt 2011-07-05 switch-to-buffer changes to new switch-to-buffer
* lisp/bindings.el (mode-line-other-buffer): * lisp/bookmark.el (bookmark-bmenu-2-window): * lisp/bs.el (bs-cycle-next, bs-cycle-previous): * lisp/net/tramp-cmds.el (tramp-append-tramp-buffers): Revert to using switch-to-buffer. * lisp/net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window): Deleted.
Diffstat (limited to 'lisp/bs.el')
-rw-r--r--lisp/bs.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/bs.el b/lisp/bs.el
index c7326eedd26..49ffb3f822c 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1215,8 +1215,7 @@ by buffer configuration `bs-cycle-configuration-name'."
;; We don't want the frame iconified if the only window in the frame
;; happens to be dedicated.
(bury-buffer (current-buffer))
- (with-no-warnings ; We really do want to call `switch-to-buffer' here.
- (switch-to-buffer next))
+ (switch-to-buffer next nil t)
(setq bs--cycle-list (append (cdr cycle-list)
(list (car cycle-list))))
(bs-message-without-log "Next buffers: %s"
@@ -1245,8 +1244,7 @@ by buffer configuration `bs-cycle-configuration-name'."
bs--cycle-list)))
(prev-buffer (car tupel))
(cycle-list (cdr tupel)))
- (with-no-warnings ; We really do want to call `switch-to-buffer' here.
- (switch-to-buffer prev-buffer))
+ (switch-to-buffer prev-buffer nil t)
(setq bs--cycle-list (append (last cycle-list)
(reverse (cdr (reverse cycle-list)))))
(bs-message-without-log "Previous buffers: %s"