diff options
| author | Miles Bader <miles@gnu.org> | 2008-01-08 20:46:54 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-01-08 20:46:54 +0000 |
| commit | 59ce725a3b68cbc324f01bc8dc5f9e07286431d1 (patch) | |
| tree | c17b8f002edf6892e273ff53214b1b23c880e69f /lisp/ffap.el | |
| parent | 0664ff722152f34c2e87e9e644bbab401530b9d4 (diff) | |
| parent | bf515869577b12abd42777fb0647259920c862fc (diff) | |
| download | emacs-59ce725a3b68cbc324f01bc8dc5f9e07286431d1.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
Diffstat (limited to 'lisp/ffap.el')
| -rw-r--r-- | lisp/ffap.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ffap.el b/lisp/ffap.el index d045e5aa7f9..52fb372b8cd 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -1,7 +1,7 @@ ;;; ffap.el --- find file (or url) at point ;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu> ;; Maintainer: FSF @@ -1262,7 +1262,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 |