Index: lisp/net/tramp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.92
diff -u -r1.92 tramp.el
--- lisp/net/tramp.el	18 Apr 2006 10:02:40 -0000	1.92
+++ lisp/net/tramp.el	20 Apr 2006 05:06:59 -0000
@@ -4337,16 +4337,21 @@
 	(save-match-data (apply (cdr fn) args))
       (tramp-completion-run-real-handler operation args))))
 
+;; Register in file name handler alist.
+;; `tramp-completion-file-name-handler' must not be active when temacs
+;; dumps.  And it makes no sense in batch mode anyway.
 ;;;###autoload
-(put 'tramp-completion-file-name-handler 'safe-magic t)
+(defun tramp-register-file-name-handler ()
+  (unless noninteractive
+    (add-to-list 'file-name-handler-alist
+		 (cons tramp-file-name-regexp 'tramp-file-name-handler))
+    (add-to-list 'file-name-handler-alist
+		 (cons tramp-completion-file-name-regexp
+		       'tramp-completion-file-name-handler))
+    (put 'tramp-completion-file-name-handler 'safe-magic t)))
 
-;; Register in file name handler alist
-;;;###autoload
-(add-to-list 'file-name-handler-alist
-	     (cons tramp-file-name-regexp 'tramp-file-name-handler))
-(add-to-list 'file-name-handler-alist
-	     (cons tramp-completion-file-name-regexp
-		   'tramp-completion-file-name-handler))
+;;;###autoload (add-hook 'emacs-startup-hook 'tramp-register-file-name-handler)
+(tramp-register-file-name-handler)
 
 ;;;###autoload
 (defun tramp-unload-file-name-handler-alist ()