From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: Build failure with latest CVS Date: Thu, 20 Apr 2006 07:08:52 +0200 Message-ID: <871wvs3kbf.fsf@gmx.de> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: sea.gmane.org 1145509766 8634 80.91.229.2 (20 Apr 2006 05:09:26 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 20 Apr 2006 05:09:26 +0000 (UTC) Cc: Andreas Schwab , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 20 07:09:24 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FWRPm-0007jw-UQ for ged-emacs-devel@m.gmane.org; Thu, 20 Apr 2006 07:09:15 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FWRPm-0005t9-CL for ged-emacs-devel@m.gmane.org; Thu, 20 Apr 2006 01:09:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FWRPY-0005sq-2i for emacs-devel@gnu.org; Thu, 20 Apr 2006 01:09:00 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FWRPV-0005sb-Ji for emacs-devel@gnu.org; Thu, 20 Apr 2006 01:08:58 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FWRPV-0005sY-Dn for emacs-devel@gnu.org; Thu, 20 Apr 2006 01:08:57 -0400 Original-Received: from [213.165.64.20] (helo=mail.gmx.net) by monty-python.gnu.org with smtp (Exim 4.52) id 1FWRQl-0005Ui-2H for emacs-devel@gnu.org; Thu, 20 Apr 2006 01:10:15 -0400 Original-Received: (qmail invoked by alias); 20 Apr 2006 05:08:53 -0000 Original-Received: from p54BD9806.dip0.t-ipconnect.de (EHLO localhost.local) [84.189.152.6] by mail.gmx.net (mp029) with SMTP; 20 Apr 2006 07:08:53 +0200 X-Authenticated: #3708877 Original-To: "Juanma Barranquero" In-Reply-To: (Juanma Barranquero's message of "Tue, 18 Apr 2006 12:03:43 +0200") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) X-Y-GMX-Trusted: 0 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:53118 Archived-At: --=-=-= "Juanma Barranquero" writes: > On 4/18/06, Andreas Schwab 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. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=patch.diff 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 () --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --=-=-=--