Mercurial > emacs
diff lisp/ffap.el @ 87649:107ccd98fa12
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 08 Jan 2008 20:46:54 +0000 |
parents | 5a96d566fe43 73661ddc7ac7 |
children | 3091cbee6fd8 606f2d163a64 |
line wrap: on
line diff
--- a/lisp/ffap.el Tue Jan 08 20:07:21 2008 +0000 +++ b/lisp/ffap.el Tue Jan 08 20:46:54 2008 +0000 @@ -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 @@ )) (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