[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 9dfabe0756 2/3: Assume dired-guess is now always available
From: |
Stefan Kangas |
Subject: |
master 9dfabe0756 2/3: Assume dired-guess is now always available |
Date: |
Wed, 17 Aug 2022 10:32:54 -0400 (EDT) |
branch: master
commit 9dfabe075698760bd74580d97f647cb2a6a32f1b
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
Assume dired-guess is now always available
* lisp/dired-aux.el (dired-read-shell-command): Use
dired-guess-shell-command unconditionally, as it is now always
available.
(dired-do-shell-command): Doc fix; dired-guess is always available.
* lisp/dired.el (dired-do-man): Don't require dired-x.
---
lisp/dired-aux.el | 14 +++++---------
lisp/dired.el | 4 ----
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 426273f65e..94b2baf72d 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -780,20 +780,16 @@ which is replaced by the value returned by
`dired-mark-prompt',
with ARG and FILES as its arguments. FILES should be a list of
file names. The result is used as the prompt.
-This normally reads using `read-shell-command', but if the
-`dired-x' package is loaded, use `dired-guess-shell-command' to
-offer a smarter default choice of shell command."
+Use `dired-guess-shell-command' to offer a smarter default choice
+of shell command."
(minibuffer-with-setup-hook
(lambda ()
(setq-local dired-aux-files files)
(setq-local minibuffer-default-add-function
#'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
- 'dired-guess-shell-command prompt files)
- (dired-mark-pop-up nil 'shell files
- 'read-shell-command prompt nil nil))))
+ (dired-mark-pop-up nil 'shell files
+ 'dired-guess-shell-command prompt files)))
;;;###autoload
(defcustom dired-confirm-shell-command t
@@ -882,7 +878,7 @@ In a noninteractive call (from Lisp code), you must specify
the list of file names explicitly with the FILE-LIST argument, which
can be produced by `dired-get-marked-files', for example.
-If `dired-x' is loaded, `dired-guess-shell-alist-default' and
+`dired-guess-shell-alist-default' and
`dired-guess-shell-alist-user' are consulted when the user is
prompted for the shell command to use interactively.
diff --git a/lisp/dired.el b/lisp/dired.el
index 799a9f4716..01098fdf89 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4919,16 +4919,12 @@ Interactively with prefix argument, read FILE-NAME."
;;; Miscellaneous commands
(declare-function Man-getpage-in-background "man" (topic))
-(declare-function dired-guess-shell-command "dired-x" (prompt files))
(defvar manual-program) ; from man.el
(defun dired-do-man ()
"In Dired, run `man' on this file."
(interactive nil dired-mode)
(require 'man)
- ;; FIXME: Move `dired-guess-shell-command' to dired.el to remove the
- ;; need for requiring `dired-x'.
- (require 'dired-x)
(let* ((file (dired-get-file-for-visit))
(manual-program (string-replace "*" "%s"
(dired-guess-shell-command