[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105188: Adapt 2011-07-05 switch-to-b
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105188: Adapt 2011-07-05 switch-to-buffer changes to new switch-to-buffer |
Date: |
Wed, 13 Jul 2011 21:40:30 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105188
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 21:40:30 -0400
message:
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.
modified:
lisp/ChangeLog
lisp/bindings.el
lisp/bookmark.el
lisp/bs.el
lisp/net/tramp-cmds.el
lisp/net/tramp-compat.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-07-14 01:09:00 +0000
+++ b/lisp/ChangeLog 2011-07-14 01:40:30 +0000
@@ -1,3 +1,14 @@
+2011-07-14 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* follow.el (follow-debug-message, follow-redisplay):
=== modified file 'lisp/bindings.el'
--- a/lisp/bindings.el 2011-07-13 13:39:23 +0000
+++ b/lisp/bindings.el 2011-07-14 01:40:30 +0000
@@ -471,8 +471,7 @@
(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."
=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el 2011-07-05 15:31:22 +0000
+++ b/lisp/bookmark.el 2011-07-14 01:40:30 +0000
@@ -1841,8 +1841,7 @@
(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)))
=== modified file 'lisp/bs.el'
--- a/lisp/bs.el 2011-07-05 15:31:22 +0000
+++ b/lisp/bs.el 2011-07-14 01:40:30 +0000
@@ -1215,8 +1215,7 @@
;; 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 @@
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"
=== modified file 'lisp/net/tramp-cmds.el'
--- a/lisp/net/tramp-cmds.el 2011-07-06 09:48:20 +0000
+++ b/lisp/net/tramp-cmds.el 2011-07-14 01:40:30 +0000
@@ -308,7 +308,7 @@
;; 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 @@
;; 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
=== modified file 'lisp/net/tramp-compat.el'
--- a/lisp/net/tramp-compat.el 2011-07-06 09:48:20 +0000
+++ b/lisp/net/tramp-compat.el 2011-07-14 01:40:30 +0000
@@ -502,15 +502,6 @@
"`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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105188: Adapt 2011-07-05 switch-to-buffer changes to new switch-to-buffer,
Chong Yidong <=