[Emacs-diffs] /srv/bzr/emacs/trunk r106842: * lisp/dired-aux.el (dired-do-shell-command): Fix */? logic. (Bug#6561)

[Glenn Morris]

------------------------------------------------------------
revno: 106842
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-01-10 21:24:02 -0500
message:
  * lisp/dired-aux.el (dired-do-shell-command): Fix */? logic.  (Bug#6561)
modified:
  lisp/ChangeLog
  lisp/dired-aux.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-10 17:32:19 +0000
+++ b/lisp/ChangeLog    2012-01-11 02:24:02 +0000
@@ -1,3 +1,7 @@
+2012-01-11  Glenn Morris  <address@hidden>
+
+       * dired-aux.el (dired-do-shell-command): Fix */? logic.  (Bug#6561)
+
 2012-01-10  Chong Yidong  <address@hidden>
 
        * net/network-stream.el (network-stream-open-starttls): Avoid

=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2012-01-05 09:46:05 +0000
+++ b/lisp/dired-aux.el 2012-01-11 02:24:02 +0000
@@ -605,16 +605,16 @@
       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