mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
* net/tramp.el (top): Move loading of tramp-util.el and
tramp-vc.el to tramp-compat.el. (tramp-make-tramp-temp-file): Complete rewrite. Create remote temporary file if possible, in order to avoid a security hole. (tramp-do-copy-or-rename-file-out-of-band) (tramp-maybe-open-connection): Call `tramp-make-tramp-temp-file' with DONT-CREATE, because the connection is not setup yet. (tramp-handle-process-file): Rewrite temporary file handling. (tramp-completion-mode): New defvar. (tramp-completion-mode-p): Use it. * net/tramp-compat.el (top): Load tramp-util.el and tramp-vc.el. * net/tramp-fish.el (tramp-fish-handle-process-file): Rewrite temporary file handling.
This commit is contained in:
parent
ea3fc256d4
commit
a6e9632782
4 changed files with 129 additions and 74 deletions
|
|
@ -40,6 +40,32 @@
|
|||
(require 'timer-funcs)
|
||||
(require 'timer))
|
||||
|
||||
;; tramp-util offers integration into other (X)Emacs packages like
|
||||
;; compile.el, gud.el etc. Not necessary in Emacs 23.
|
||||
(eval-after-load "tramp"
|
||||
;; We check whether `start-file-process' is an alias.
|
||||
'(when (or (not (fboundp 'start-file-process))
|
||||
(symbolp (symbol-function 'start-file-process)))
|
||||
(require 'tramp-util)
|
||||
(add-hook 'tramp-unload-hook
|
||||
'(lambda ()
|
||||
(when (featurep 'tramp-util)
|
||||
(unload-feature 'tramp-util 'force))))))
|
||||
|
||||
;; Make sure that we get integration with the VC package. When it
|
||||
;; is loaded, we need to pull in the integration module. Not
|
||||
;; necessary in Emacs 23.
|
||||
(eval-after-load "vc"
|
||||
(eval-after-load "tramp"
|
||||
;; We check whether `start-file-process' is an alias.
|
||||
'(when (or (not (fboundp 'start-file-process))
|
||||
(symbolp (symbol-function 'start-file-process)))
|
||||
(require 'tramp-vc)
|
||||
(add-hook 'tramp-unload-hook
|
||||
'(lambda ()
|
||||
(when (featurep 'tramp-vc)
|
||||
(unload-feature 'tramp-vc 'force)))))))
|
||||
|
||||
;; Avoid byte-compiler warnings if the byte-compiler supports this.
|
||||
;; Currently, XEmacs supports this.
|
||||
(when (featurep 'xemacs)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue