summaryrefslogtreecommitdiff
path: root/lisp/bookmark.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/bookmark.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/bookmark.el')
-rw-r--r--lisp/bookmark.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 9f90ecedc4d..bb7ad153e8b 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1841,8 +1841,7 @@ With a prefix arg, prompts for a file to save them in."
(menu (current-buffer))
(pop-up-windows t))
(delete-other-windows)
- (with-no-warnings ; We really do want to call `switch-to-buffer' here.
- (switch-to-buffer (other-buffer)))
+ (switch-to-buffer (other-buffer) nil t)
(bookmark--jump-via bmrk 'pop-to-buffer)
(bury-buffer menu)))