diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 15 |
2 files changed, 10 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 80aeddee9ce..673c28f021b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2008-04-28 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-replace-environment-variables): Remove it. + There is a more simple solution. + (tramp-file-name-handler): Apply `substitute-in-file-name' w/o + Tramp file name handlers. + 2008-04-28 Nick Roberts <nickrob@snap.net.nz> * progmodes/gdb-ui.el (gdb-info-breakpoints-custom): Make breakpoint diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 98eb93aa208..5b2c9525b25 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4375,16 +4375,6 @@ ARGS are the arguments OPERATION has been called with." (setq res (cdr elt)))) res))) -(defun tramp-replace-environment-variables (filename) - "Replace environment variables in FILENAME. -Return the string with the replaced variables." - (when (string-match "$\\w+" filename) - (setq filename - (replace-match - (substitute-in-file-name (match-string 0 filename)) - t nil filename))) - filename) - ;; Main function. ;;;###autoload (defun tramp-file-name-handler (operation &rest args) @@ -4394,8 +4384,9 @@ Falls back to normal file name handler if no tramp file name handler exists." ;; (edebug-trace "%s" (with-output-to-string (backtrace))) (save-match-data (let* ((filename - (tramp-replace-environment-variables - (apply 'tramp-file-name-for-operation operation args))) + (tramp-run-real-handler + 'substitute-in-file-name + (list (apply 'tramp-file-name-for-operation operation args)))) (completion (tramp-completion-mode-p filename)) (foreign (tramp-find-foreign-file-name-handler filename))) (with-parsed-tramp-file-name filename nil |