>From 97d5ec40ccbb3a2d366aaa05b45e29690ee5288a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Le=20Gouguec?= Date: Mon, 29 Jul 2019 20:48:53 +0200 Subject: [PATCH] Tweak dired-do-shell-command warning some more * lisp/dired-aux.el (dired--no-subst-prompt): Clarify what we are concerned about. (bug#28969, bug#35564) --- lisp/dired-aux.el | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 3887d75356..35052785ba 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -120,17 +120,18 @@ dired--no-subst-prompt ;; text will shove the command to the right, and the '^' markers ;; will become misaligned. (apply #'concat - `("Confirm:\n" + `(,(format-message + (ngettext + "Warning: the shell may interpret %d occurrence of `%s' as wildcard:\n" + "Warning: the shell may interpret %d occurrences of `%s' as wildcards:\n" + (length char-positions)) + (length char-positions) + (propertize (string (aref command (car char-positions))) + 'face 'warning)) ,command "\n" ,@(when add-markers (list (dired--mark-positions char-positions) "\n")) - ,(format-message - (ngettext "Send %d occurrence of `%s' as-is to shell?" - "Send %d occurrences of `%s' as-is to shell?" - (length char-positions)) - (length char-positions) - (propertize (string (aref command (car char-positions))) - 'face 'warning))))) + "Proceed anyway?"))) ;;;###autoload (defun dired-diff (file &optional switches) -- 2.22.0