From 8bdfa0649baea761588c1c9a741570689cecc66c Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 13 Jul 2011 21:40:30 -0400 Subject: [PATCH] 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. --- lisp/ChangeLog | 11 +++++++++++ lisp/bindings.el | 3 +-- lisp/bookmark.el | 3 +-- lisp/bs.el | 6 ++---- lisp/net/tramp-cmds.el | 4 ++-- lisp/net/tramp-compat.el | 9 --------- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4aa24d499e2..1778fa9bc97 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +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 + switch-to-buffer. + + * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window): + Deleted. + 2011-07-14 Juanma Barranquero * follow.el (follow-debug-message, follow-redisplay): diff --git a/lisp/bindings.el b/lisp/bindings.el index 57601637ed6..3d7135c16de 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -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." (interactive) - (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." 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))) 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" diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el index f20040e8a9a..fcf523a7068 100644 --- a/lisp/net/tramp-cmds.el +++ b/lisp/net/tramp-cmds.el @@ -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)) (delete-other-windows) (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. (progn (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 diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index e7ea4354b51..460c9f0e118 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -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) - (tramp-compat-funcall - '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))) -- 2.39.2