# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1146326311 0
# Node ID 32b384911b4ffff6baafd2e1b1e212101b6fd201
# Parent  3d36e736dc2a7aaf2d2083705bb84c95144c49e3
tramp-file-name-handler-alist): Delete expand-file-name and other
operations that can cause spurious loading.

diff -r 3d36e736dc2a -r 32b384911b4f lisp/net/tramp.el
--- a/lisp/net/tramp.el	Sat Apr 29 15:11:38 2006 +0000
+++ b/lisp/net/tramp.el	Sat Apr 29 15:58:31 2006 +0000
@@ -1822,7 +1822,7 @@
 This string is passed to `format', so percent characters need to be doubled.")
 
 ; These values conform to `file-attributes' from XEmacs 21.2.
-; GNU Emacs and other tools not checked.
+; Emacs and other tools not checked.
 (defconst tramp-file-mode-type-map '((0  . "-")  ; Normal file (SVID-v2 and XPG2)
 				     (1  . "p")  ; fifo
 				     (2  . "c")  ; character device
@@ -1927,17 +1927,13 @@
   "Alist of handler functions.
 Operations not mentioned here will be handled by the normal Emacs functions.")
 
-;; Handlers for partial tramp file names. For GNU Emacs just
-;; `file-name-all-completions' is needed. The other ones are necessary
-;; for XEmacs.
+
+;; Handlers for partial tramp file names.  For Emacs just
+;; `file-name-all-completions' is needed.
 (defconst tramp-completion-file-name-handler-alist
   '(
-    (file-name-directory . tramp-completion-handle-file-name-directory)
-    (file-name-nondirectory . tramp-completion-handle-file-name-nondirectory)
-    (file-exists-p . tramp-completion-handle-file-exists-p)
     (file-name-all-completions . tramp-completion-handle-file-name-all-completions)
-    (file-name-completion . tramp-completion-handle-file-name-completion)
-    (expand-file-name . tramp-completion-handle-expand-file-name))
+    (file-name-completion . tramp-completion-handle-file-name-completion))
   "Alist of completion handler functions.
 Used for file names matching `tramp-file-name-regexp'. Operations not
 mentioned here will be handled by `tramp-file-name-handler-alist' or the