Commit 8bdfa064 authored by Chong Yidong's avatar Chong Yidong
Browse files

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

* lisp/net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):
parent 5eba16a3
2011-07-14 Chong Yidong <>
* bindings.el (mode-line-other-buffer):
* bookmark.el (bookmark-bmenu-2-window):
* bs.el (bs-cycle-next, bs-cycle-previous):
* net/tramp-cmds.el (tramp-append-tramp-buffers): Revert to using
* net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):
2011-07-14 Juanma Barranquero <>
* follow.el (follow-debug-message, follow-redisplay):
......@@ -471,8 +471,7 @@ Like `bury-buffer', but temporarily select EVENT's window."
(defun mode-line-other-buffer () "\
Switch to the most recently selected buffer other than the current one."
(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))
(defun mode-line-next-buffer (event)
"Like `next-buffer', but temporarily select EVENT's window."
......@@ -1841,8 +1841,7 @@ With a prefix arg, prompts for a file to save them in."
(menu (current-buffer))
(pop-up-windows t))
(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)))
......@@ -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'."
(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"
......@@ -308,7 +308,7 @@ buffer in your bug report.
;; There is at least one Tramp buffer.
(when buffer-list
(tramp-compat-pop-to-buffer-same-window (list-buffers-noselect nil))
(switch-to-buffer (list-buffers-noselect nil))
(setq buffer-read-only nil)
(goto-char (point-min))
......@@ -343,7 +343,7 @@ the debug buffer(s).")
;; OK, let's send. First we delete the buffer list.
(kill-buffer nil)
(tramp-compat-pop-to-buffer-same-window curbuf)
(switch-to-buffer curbuf)
(goto-char (point-max))
(insert "\n\
This is a special notion of the `gnus/message' package. If you
......@@ -502,15 +502,6 @@ EOL-TYPE can be one of `dos', `unix', or `mac'."
"`dos', `unix', or `mac'")))))
(t (error "Can't change EOL conversion -- is MULE missing?"))))
;; `pop-to-buffer-same-window' has been introduced with Emacs 24.1.
(defun tramp-compat-pop-to-buffer-same-window
(&optional buffer-or-name norecord label)
"Pop to buffer specified by BUFFER-OR-NAME in the selected window."
(if (fboundp 'pop-to-buffer-same-window)
'pop-to-buffer-same-window buffer-or-name norecord label)
(tramp-compat-funcall 'switch-to-buffer buffer-or-name norecord)))
(add-hook 'tramp-unload-hook
(lambda ()
(unload-feature 'tramp-compat 'force)))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment