aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2008-01-06 14:06:37 +0000
committerMichael Albinus2008-01-06 14:06:37 +0000
commitd8df12809954020ba74155328b44cfbe5c4cbb16 (patch)
treea5ce6238c7f6eff1ff0ab31625b7b85794dd59a0
parent5071a884655c4cdd3698fb54c32c7cd551a977a8 (diff)
downloademacs-d8df12809954020ba74155328b44cfbe5c4cbb16.tar.gz
emacs-d8df12809954020ba74155328b44cfbe5c4cbb16.zip
* ffap.el (ffap-read-file-or-url): Let-bind
`file-name-handler-alist' due to `rfn-eshadow-update-overlay'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ffap.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 114b81c905f..c47edb27a1e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-01-06 Michael Albinus <michael.albinus@gmx.de>
2
3 * ffap.el (ffap-read-file-or-url): Let-bind
4 `file-name-handler-alist' due to `rfn-eshadow-update-overlay'.
5
12008-01-05 Sven Joachim <svenjoac@gmx.de> 62008-01-05 Sven Joachim <svenjoac@gmx.de>
2 7
3 * vc-bzr.el: Fix typo in header. 8 * 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."
1259 )) 1259 ))
1260 (setq dir (file-name-directory guess)))) 1260 (setq dir (file-name-directory guess))))
1261 (let ((minibuffer-completing-file-name t) 1261 (let ((minibuffer-completing-file-name t)
1262 (completion-ignore-case read-file-name-completion-ignore-case)) 1262 (completion-ignore-case read-file-name-completion-ignore-case)
1263 ;; because of `rfn-eshadow-update-overlay'.
1264 (file-name-handler-alist
1265 (cons (cons ffap-url-regexp 'url-file-handler)
1266 file-name-handler-alist)))
1263 (setq guess 1267 (setq guess
1264 (completing-read 1268 (completing-read
1265 prompt 1269 prompt