Commit e52c37fa authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/dired-aux.el (dired-do-shell-command): Fix */? logic. (Bug#6561)

parent ce316182
2012-01-11 Glenn Morris <rgm@gnu.org>
* dired-aux.el (dired-do-shell-command): Fix */? logic. (Bug#6561)
2012-01-10 Chong Yidong <cyd@gnu.org>
* net/network-stream.el (network-stream-open-starttls): Avoid
......
......@@ -605,16 +605,16 @@ can be produced by `dired-get-marked-files', for example."
current-prefix-arg
files)))
(let* ((on-each (not (string-match dired-star-subst-regexp command)))
(subst (not (string-match dired-quark-subst-regexp command)))
(star (not (string-match "\\*" command)))
(qmark (not (string-match "\\?" command))))
(no-subst (not (string-match dired-quark-subst-regexp command)))
(star (string-match "\\*" command))
(qmark (string-match "\\?" command)))
;; Get confirmation for wildcards that may have been meant
;; to control substitution of a file name or the file name list.
(if (cond ((not (or on-each subst))
(if (cond ((not (or on-each no-subst))
(error "You can not combine `*' and `?' substitution marks"))
((and star (not on-each))
((and star on-each)
(y-or-n-p "Confirm--do you mean to use `*' as a wildcard? "))
((and qmark (not subst))
((and qmark no-subst)
(y-or-n-p "Confirm--do you mean to use `?' as a wildcard? "))
(t))
(if on-each
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment