diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2012-12-06 10:15:27 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2012-12-06 10:15:27 +0100 |
| commit | 5504e2c7ecd37115d4bb4105eca7b441336157f8 (patch) | |
| tree | 3998547ee5414a6888028a5045c7c6be4c336556 /lisp/net/tramp.el | |
| parent | 4288142b39579bbae9ab3d118c756915f27077f5 (diff) | |
| download | emacs-5504e2c7ecd37115d4bb4105eca7b441336157f8.tar.gz emacs-5504e2c7ecd37115d4bb4105eca7b441336157f8.tar.bz2 emacs-5504e2c7ecd37115d4bb4105eca7b441336157f8.zip | |
* net/tramp.el (tramp-replace-environment-variables): Hide
compiler warning.
(tramp-file-name-for-operation): Remove `executable-find',
`start-process', `call-process' and `call-process-region'.
* net/tramp-compat.el (top): Don't require 'tramp-util and 'tramp-vc.
* net/tramp-gvfs.el (tramp-gvfs-dbus-event-error): Ensure backward
compatibility.
* net/tramp-sh.el (top): Remove `tramp-sh-handle-call-process-region'.
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index d6f2177b03b..a4d36cbe72c 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1750,10 +1750,12 @@ value of `default-file-modes', without execute permissions." (defalias 'tramp-replace-environment-variables (if (ignore-errors - (equal "${ tramp?}" (substitute-env-vars "${ tramp?}" 'only-defined))) + (equal "${ tramp?}" + (tramp-compat-funcall + 'substitute-env-vars "${ tramp?}" 'only-defined))) (lambda (filename) "Like `substitute-env-vars' with `only-defined' non-nil." - (substitute-env-vars filename 'only-defined)) + (tramp-compat-funcall 'substitute-env-vars filename 'only-defined)) (lambda (filename) "Replace environment variables in FILENAME. Return the string with the replaced variables." @@ -1928,10 +1930,7 @@ ARGS are the arguments OPERATION has been called with." ;; Emacs 23+ only. 'start-file-process ;; XEmacs only. - 'dired-print-file 'dired-shell-call-process - ;; nowhere yet. - 'executable-find 'start-process - 'call-process 'call-process-region)) + 'dired-print-file 'dired-shell-call-process)) default-directory) ;; Unknown file primitive. (t (error "unknown file I/O primitive: %s" operation)))) |