procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ido-fallback special variable (Bug#31707)

Browse source 
Before ido.el switch to lexical-binding, it was possible for other
packages to modify the 'fallback' variables declared inside
'ido-file-internal' and 'ido-buffer-internal'.
* lisp/ido.el (ido-fallback): New variable.
(ido-buffer-internal, ido-file-internal): Reset ido-fallback to nil
before prompting user.  Use ido-fallback when ido-exit is 'fallback'.
(ido-fallback-command): Add optional FALLBACK-COMMAND argument.

Copyright-paperwork-exempt: yes
This commit is contained in:
Christophe Junke 2018-06-04 10:39:43 +02:00 • committed by Noam Postavsky
parent 826e8d1f12
commit 12c77f6918
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/ido.el
View file

@ -1239,6 +1239,9 @@ Only used if `ido-use-virtual-buffers' is non-nil.")
;; Dynamically bound in ido-read-internal. ;; Dynamically bound in ido-read-internal.
(defvar ido-completing-read) (defvar ido-completing-read)
;; If dynamically set when ido-exit is 'fallback, overrides fallback command.
(defvar ido-fallback nil)
;;; FUNCTIONS ;;; FUNCTIONS
(defun ido-active (&optional merge) (defun ido-active (&optional merge)
@ -2220,6 +2223,7 @@ If cursor is not at the end of the user input, move to end of input."
(run-hook-with-args 'ido-before-fallback-functions (run-hook-with-args 'ido-before-fallback-functions
(or fallback 'switch-to-buffer)) (or fallback 'switch-to-buffer))
(call-interactively (or fallback 'switch-to-buffer))) (call-interactively (or fallback 'switch-to-buffer)))
(setq ido-fallback nil)
(let* ((ido-context-switch-command switch-cmd) (let* ((ido-context-switch-command switch-cmd)
(ido-current-directory nil) (ido-current-directory nil)
(ido-directory-nonreadable nil) (ido-directory-nonreadable nil)
@ -2245,7 +2249,7 @@ If cursor is not at the end of the user input, move to end of input."
((eq ido-exit 'fallback) ((eq ido-exit 'fallback)
(let ((read-buffer-function nil)) (let ((read-buffer-function nil))
(setq this-command (or fallback 'switch-to-buffer)) (setq this-command (or ido-fallback fallback 'switch-to-buffer))
(run-hook-with-args 'ido-before-fallback-functions this-command) (run-hook-with-args 'ido-before-fallback-functions this-command)
(call-interactively this-command))) (call-interactively this-command)))
@ -2341,6 +2345,7 @@ If cursor is not at the end of the user input, move to end of input."
;; Internal function for ido-find-file and friends ;; Internal function for ido-find-file and friends
(unless item (unless item
(setq item 'file)) (setq item 'file))
(setq ido-fallback nil)
(let ((ido-current-directory (ido-expand-directory default)) (let ((ido-current-directory (ido-expand-directory default))
(ido-context-switch-command switch-cmd) (ido-context-switch-command switch-cmd)
ido-directory-nonreadable ido-directory-too-big ido-directory-nonreadable ido-directory-too-big
@ -2412,7 +2417,7 @@ If cursor is not at the end of the user input, move to end of input."
;; we don't want to change directory of current buffer. ;; we don't want to change directory of current buffer.
(let ((default-directory ido-current-directory) (let ((default-directory ido-current-directory)
(read-file-name-function nil)) (read-file-name-function nil))
(setq this-command (or fallback 'find-file)) (setq this-command (or ido-fallback fallback 'find-file))
(run-hook-with-args 'ido-before-fallback-functions this-command) (run-hook-with-args 'ido-before-fallback-functions this-command)
(call-interactively this-command))) (call-interactively this-command)))
@ -2821,13 +2826,15 @@ If no buffer or file exactly matching the prompt exists, maybe create a new one.
(setq ido-exit 'takeprompt) (setq ido-exit 'takeprompt)
(exit-minibuffer)) (exit-minibuffer))
(defun ido-fallback-command () (defun ido-fallback-command (&optional fallback-command)
"Fallback to non-Ido version of current command." "Fallback to non-Ido version of current command.
The optional FALLBACK-COMMAND argument indicates which command to run."
(interactive) (interactive)
(let ((i (length ido-text))) (let ((i (length ido-text)))
(while (> i 0) (while (> i 0)
(push (aref ido-text (setq i (1- i))) unread-command-events))) (push (aref ido-text (setq i (1- i))) unread-command-events)))
(setq ido-exit 'fallback) (setq ido-exit 'fallback)
(setq ido-fallback fallback-command)
(exit-minibuffer)) (exit-minibuffer))
(defun ido-enter-find-file () (defun ido-enter-find-file ()