[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104984: * net/tramp-compat.el (tramp
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104984: * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window): New defun. |
Date: |
Wed, 06 Jul 2011 11:48:20 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104984
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-06 11:48:20 +0200
message:
* net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window): New defun.
* net/tramp-cmds.el (tramp-append-tramp-buffers): Use it.
modified:
lisp/ChangeLog
lisp/net/tramp-cmds.el
lisp/net/tramp-compat.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-07-06 03:51:48 +0000
+++ b/lisp/ChangeLog 2011-07-06 09:48:20 +0000
@@ -1,3 +1,9 @@
+2011-07-06 Michael Albinus <address@hidden>
+
+ * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):
+ New defun.
+ * net/tramp-cmds.el (tramp-append-tramp-buffers): Use it.
+
2011-07-06 Michael R. Mauger <address@hidden>
* progmodes/sql.el: Version 3.0
=== modified file 'lisp/net/tramp-cmds.el'
--- a/lisp/net/tramp-cmds.el 2011-07-05 15:31:22 +0000
+++ b/lisp/net/tramp-cmds.el 2011-07-06 09:48:20 +0000
@@ -308,7 +308,7 @@
;; There is at least one Tramp buffer.
(when buffer-list
- (pop-to-buffer-same-window (list-buffers-noselect nil))
+ (tramp-compat-pop-to-buffer-same-window (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)
- (pop-to-buffer-same-window curbuf)
+ (tramp-compat-pop-to-buffer-same-window 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-03-12 19:19:47 +0000
+++ b/lisp/net/tramp-compat.el 2011-07-06 09:48:20 +0000
@@ -23,9 +23,9 @@
;;; Commentary:
-;; Tramp's main Emacs version for development is GNU Emacs 24. This
-;; package provides compatibility functions for GNU Emacs 22, GNU
-;; Emacs 23 and XEmacs 21.4+.
+;; Tramp's main Emacs version for development is Emacs 24. This
+;; package provides compatibility functions for Emacs 22, Emacs 23,
+;; XEmacs 21.4+ and SXEmacs 22.
;;; Code:
@@ -286,9 +286,8 @@
(tramp-compat-funcall 'file-attributes filename id-format)
(wrong-number-of-arguments (file-attributes filename))))))
-;; PRESERVE-UID-GID has been introduced with Emacs 23. It does not
-;; hurt to ignore it for other (X)Emacs versions.
-;; PRESERVE-SELINUX-CONTEXT has been introduced with Emacs 24.
+;; PRESERVE-UID-GID does not exist in XEmacs.
+;; PRESERVE-SELINUX-CONTEXT has been introduced with Emacs 24.1.
(defun tramp-compat-copy-file
(filename newname &optional ok-if-already-exists keep-date
preserve-uid-gid preserve-selinux-context)
@@ -484,10 +483,7 @@
(tramp-compat-funcall 'set-process-query-on-exit-flag process flag)
(tramp-compat-funcall 'process-kill-without-query process flag)))
-(add-hook 'tramp-unload-hook
- (lambda ()
- (unload-feature 'tramp-compat 'force)))
-
+;; There exist different implementations for this function.
(defun tramp-compat-coding-system-change-eol-conversion (coding-system
eol-type)
"Return a coding system like CODING-SYSTEM but with given EOL-TYPE.
EOL-TYPE can be one of `dos', `unix', or `mac'."
@@ -506,6 +502,19 @@
"`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)))
+
(provide 'tramp-compat)
;;; TODO:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104984: * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window): New defun.,
Michael Albinus <=