andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make ffap-file-finder work again

Browse source 
* lisp/ffap.el (find-file-at-point): Allow people to set
ffap-file-finder again (bug#50279).

* lisp/ido.el (ido-everywhere): Add an interstitial to fulfil
ffap-file-handler semantics.
This commit is contained in:
Lars Ingebrigtsen 2022-09-06 12:24:32 +02:00
parent eaca6378d2
commit 9f3f7f1ec4
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ffap.el
View file

@ -1623,9 +1623,9 @@ and `ffap-url-at-point'."
((or (not ffap-newfile-prompt)
(file-exists-p filename)
(y-or-n-p "File does not exist, create buffer? "))
(find-file
;; expand-file-name fixes "~/~/.emacs" bug
(expand-file-name filename)))
(funcall ffap-file-finder
;; expand-file-name fixes "~/~/.emacs" bug
(expand-file-name filename)))
;; User does not want to find a non-existent file:
((signal 'file-missing (list "Opening file buffer"
"No such file or directory"

7
lisp/ido.el
View file

@ -1507,15 +1507,18 @@ Removes badly formatted data and ignored directories."
(add-hook 'minibuffer-setup-hook #'ido-minibuffer-setup)
(add-hook 'choose-completion-string-functions #'ido-choose-completion-string))
(defun ido--ffap-find-file (file)
(find-file file))
(define-minor-mode ido-everywhere
"Toggle use of Ido for all buffer/file reading."
:global t
(remove-function read-file-name-function #'ido-read-file-name)
(remove-function read-buffer-function #'ido-read-buffer)
(when (boundp 'ffap-file-finder)
(remove-function ffap-file-finder #'ido-find-file)
(remove-function ffap-file-finder #'ido--ffap-find-file)
(when ido-mode
(add-function :override ffap-file-finder #'ido-find-file)))
(add-function :override ffap-file-finder #'ido--ffap-find-file)))
(when ido-everywhere
(if (not ido-mode)
(ido-mode 'both)