# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1254573381 0
# Node ID 670a96f450aed9bf5d7777dc3ed40710f6ad2dbc
# Parent  6a210fc81bde62fb9e594dac0248a46317984b98
*** empty log message ***

diff -r 6a210fc81bde -r 670a96f450ae lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 03 12:35:55 2009 +0000
+++ b/lisp/ChangeLog	Sat Oct 03 12:36:21 2009 +0000
@@ -1,3 +1,10 @@
+2009-10-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-ftp.el (tramp-ftp-file-name-handler): Disable
+	`file-name-handler-alist' when loading 'ange-ftp.  Otherwise,
+	there could be recursive loading when `default-directory' is a
+	remote file name.  (Bug#4614)
+
 2009-10-03  Glenn Morris  <rgm@gnu.org>
 
 	* calendar/calendar.el (calendar-basic-setup): Handle the case where