emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master c2a8cff: ; Fix previous commit


From: Mark Oteiza
Subject: [Emacs-diffs] master c2a8cff: ; Fix previous commit
Date: Sun, 6 Aug 2017 10:17:32 -0400 (EDT)

branch: master
commit c2a8cffe8044cc38c4cf1b5c3d1c9571ddeec623
Author: Mark Oteiza <address@hidden>
Commit: Mark Oteiza <address@hidden>

    ; Fix previous commit
    
    The mailcap minibuffer completion used dynamic binding.  Locally set
    a dynamic variable.
    * lisp/dired-aux.el: Store list of files in
    `minibuffer-completion-table'.
---
 lisp/dired-aux.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 0a8ec26..2b89e52 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -619,8 +619,9 @@ with a prefix argument."
 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 ((commands (and (boundp 'files) (require 'mailcap nil t)
-                      (mailcap-file-default-commands files))))
+  (let* ((files minibuffer-completion-table)
+         (commands (and (require 'mailcap nil t)
+                        (mailcap-file-default-commands files))))
     (if (listp minibuffer-default)
        (append minibuffer-default commands)
       (cons minibuffer-default commands))))
@@ -638,6 +639,7 @@ 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 prompt (format prompt (dired-mark-prompt arg files)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]