diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2012-07-05 08:57:57 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2012-07-05 08:57:57 +0200 |
| commit | 957b3189e673ad7a9d2018411bbaf196338e145b (patch) | |
| tree | 43e1a031c73079f9b584fadacb0ec46639df6fe4 /lisp/net/tramp.el | |
| parent | 23f86fce48e1cc8118f0ea5cce49d1acfd4364c4 (diff) | |
| download | emacs-957b3189e673ad7a9d2018411bbaf196338e145b.tar.gz emacs-957b3189e673ad7a9d2018411bbaf196338e145b.tar.bz2 emacs-957b3189e673ad7a9d2018411bbaf196338e145b.zip | |
Sync with Tramp 2.2.6-pre.
* net/tramp.el (tramp-drop-volume-letter): Provide an XEmacs
compatible declaration.
* net/tramp-cmds.el (tramp-append-tramp-buffers): Protect
`list-load-path-shadows' call.
* net/tramp-compat.el (top): Require packages, which aren't
autoloaded anymore for XEmacs. Protect call of
`tramp-file-name-handler' by `tramp-compat-funcall', pacifying the
compiler. Do not require tramp-util.el and tramp-vc.el anymore,
it hurts at least for SXEmacs.
(tramp-compat-temporary-file-directory): In XEmacs, there is no
standard-value for `temporary-file-directory'.
* net/tramp-sh.el (tramp-do-directory-files-and-attributes-with-stat):
Redirect stderr to /dev/null.
(tramp-sh-handle-write-region): uid and gid can be floats.
Reported by Russell Sim <russell.sim@gmail.com>.
(tramp-sh-handle-vc-registered): Hide errors.
(tramp-vc-file-name-handler): Use dummy results for `process-file'
and `start-file-process'.
(tramp-maybe-open-connection): Check also whether `non-essential'
is bound.
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index d0e8b35d6ca..5e70bab24e9 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1531,6 +1531,9 @@ letter into the file name. This function removes it." 'identity)) +(if (featurep 'xemacs) + (defalias 'tramp-drop-volume-letter 'identity)) + (defun tramp-cleanup (vec) "Cleanup connection VEC, but keep the debug buffer." (with-current-buffer (tramp-get-debug-buffer vec) |