From bbc9d3793d86b855045ed322253f687fcd82aa68 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Tue, 12 Jun 2018 12:24:09 +0800 Subject: [PATCH] Fix previous change in minibuffer-default-add-dired-shell-commands The mailcap minibuffer completion used dynamic binding. Locally set a dynamic variable. * lisp/dired-aux.el (minibuffer-default-add-dired-shell-commands): Store list of files in 'minibuffer-completion-table'. (Bug#31794) --- lisp/dired-aux.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index c336103f80b..516cd2c5672 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -614,14 +614,16 @@ with a prefix argument." (declare-function mailcap-file-default-commands "mailcap" (files)) +(defvar dired-aux-files) + (defun minibuffer-default-add-dired-shell-commands () "Return a list of all commands associated with current dired files. This function is used to add all related commands retrieved by `mailcap' to the end of the list of defaults just after the default value." (interactive) - (let* ((files minibuffer-completion-table) - (commands (and (require 'mailcap nil t) - (mailcap-file-default-commands files)))) + (let ((commands (and (boundp 'dired-aux-files) + (require 'mailcap nil t) + (mailcap-file-default-commands dired-aux-files)))) (if (listp minibuffer-default) (append minibuffer-default commands) (cons minibuffer-default commands)))) @@ -639,9 +641,9 @@ This normally reads using `read-shell-command', but if the offer a smarter default choice of shell command." (minibuffer-with-setup-hook (lambda () - (set (make-local-variable 'minibuffer-completion-table) files) - (set (make-local-variable 'minibuffer-default-add-function) - 'minibuffer-default-add-dired-shell-commands)) + (setq-local dired-aux-files files) + (setq-local minibuffer-default-add-function + #'minibuffer-default-add-dired-shell-commands)) (setq prompt (format prompt (dired-mark-prompt arg files))) (if (functionp 'dired-guess-shell-command) (dired-mark-pop-up nil 'shell files -- 2.39.5