From bfdccfa141fa02f59a6b60fb92a1312feed823be Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 4 Aug 2022 12:14:10 +0200 Subject: [PATCH] Fix namespace problem in dired-aux.el * lisp/dired-aux.el (dired-minibuffer-default-add-shell-commands): Rename from 'minibuffer-default-add-dired-shell-commands'. Retain old name as an obsolete alias. --- lisp/dired-aux.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index bb24954386b..c8de2669ea3 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -760,7 +760,7 @@ with a prefix argument." (defvar dired-aux-files) -(defun minibuffer-default-add-dired-shell-commands () +(defun dired-minibuffer-default-add-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." @@ -787,7 +787,7 @@ offer a smarter default choice of shell command." (lambda () (setq-local dired-aux-files files) (setq-local minibuffer-default-add-function - #'minibuffer-default-add-dired-shell-commands)) + #'dired-minibuffer-default-add-shell-commands)) (setq prompt (format prompt (dired-mark-prompt arg files))) (if (functionp 'dired-guess-shell-command) (dired-mark-pop-up nil 'shell files @@ -3529,6 +3529,9 @@ in the Dired buffer." (setq model (vc-checkout-model backend only-files-list)))) (list backend files only-files-list state model))) +(define-obsolete-function-alias 'minibuffer-default-add-dired-shell-commands + #'dired-minibuffer-default-add-shell-commands "29.1") + (provide 'dired-aux) -- 2.39.2