[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v [EMACS_22_BASE]

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Michael Albinus <albinus>       08/04/28 19:30:51

Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.124.2.12
retrieving revision 1.124.2.13
diff -u -b -r1.124.2.12 -r1.124.2.13
--- tramp.el    27 Apr 2008 09:56:45 -0000      1.124.2.12
+++ tramp.el    28 Apr 2008 19:30:50 -0000      1.124.2.13
@@ -4375,16 +4375,6 @@
          (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 @@
 ;;  (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