From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 6 Jan 2008 14:06:37 +0000 (+0000)
Subject: * ffap.el (ffap-read-file-or-url): Let-bind
X-Git-Tag: emacs-pretest-22.1.90~176
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8df12809954020ba74155328b44cfbe5c4cbb16;p=emacs.git

* ffap.el (ffap-read-file-or-url): Let-bind
`file-name-handler-alist' due to `rfn-eshadow-update-overlay'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 114b81c905f..c47edb27a1e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	* ffap.el (ffap-read-file-or-url): Let-bind
+	`file-name-handler-alist' due to `rfn-eshadow-update-overlay'.
+
 2008-01-05  Sven Joachim  <svenjoac@gmx.de>
 
 	* vc-bzr.el: Fix typo in header.
diff --git a/lisp/ffap.el b/lisp/ffap.el
index e9ef3e10237..f54071f55c7 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1259,7 +1259,11 @@ which may actually result in an url rather than a filename."
 		    ))
 	  (setq dir (file-name-directory guess))))
     (let ((minibuffer-completing-file-name t)
-	  (completion-ignore-case read-file-name-completion-ignore-case))
+	  (completion-ignore-case read-file-name-completion-ignore-case)
+	  ;; because of `rfn-eshadow-update-overlay'.
+	  (file-name-handler-alist
+	   (cons (cons ffap-url-regexp 'url-file-handler)
+		 file-name-handler-alist)))
       (setq guess
 	    (completing-read
 	     prompt