diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-07-13 21:40:30 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-07-13 21:40:30 -0400 |
| commit | 8bdfa0649baea761588c1c9a741570689cecc66c (patch) | |
| tree | e5d3b9239c1edca1a4a208099a6cb490395a2b02 /lisp/net/tramp-compat.el | |
| parent | 5eba16a37cacff2065186df8cb6153ccaebae298 (diff) | |
| download | emacs-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/net/tramp-compat.el')
| -rw-r--r-- | lisp/net/tramp-compat.el | 9 |
1 files changed, 0 insertions, 9 deletions
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))) |