Re: Build failure with latest CVS

[Michael Albinus]

"Juanma Barranquero" <address@hidden> writes:

> On 4/18/06, Andreas Schwab <address@hidden> wrote:
>
>> With the latest CVS I'm getting this build failure:
>
> While waiting for a fix, I've reverted the autoload part of the
> 2006-04-17 change on net/tramp.el, so Emacs can be bootstrapped again.

I intend to fix it with the following patch. But I don't feel
confident whether it is the right way to do, a review of the patch
would be great. At least it works for me :-)

Best regards, Michael.

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 ()