aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/dired-aux.el
diff options
context:
space:
mode:
authorKen Raeburn2017-07-31 01:13:53 -0400
committerKen Raeburn2017-07-31 01:13:53 -0400
commit13f3370400031e2ac1c9be0932f411370fc6984e (patch)
tree06f349b2b0f1cda9e36f7c4390d9d2d9bf49303c /lisp/dired-aux.el
parentcd0966b33c1fe975520e85e0e7af82c09e4754dc (diff)
parentdcfcaf40d577808d640016c886d4fae7280a7fd5 (diff)
downloademacs-13f3370400031e2ac1c9be0932f411370fc6984e.tar.gz
emacs-13f3370400031e2ac1c9be0932f411370fc6984e.zip
; Merge from branch 'master'scratch/raeburn-startup
Diffstat (limited to 'lisp/dired-aux.el')
-rw-r--r--lisp/dired-aux.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 17dae6085df..0a8ec26f7ca 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1,4 +1,4 @@
1;;; dired-aux.el --- less commonly used parts of dired 1;;; dired-aux.el --- less commonly used parts of dired -*- lexical-binding: t -*-
2 2
3;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2017 Free Software 3;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2017 Free Software
4;; Foundation, Inc. 4;; Foundation, Inc.
@@ -742,8 +742,6 @@ can be produced by `dired-get-marked-files', for example."
742 (string-match regexp res)))) 742 (string-match regexp res))))
743 (let* ((on-each (not (dired--star-or-qmark-p command "*" 'keep))) 743 (let* ((on-each (not (dired--star-or-qmark-p command "*" 'keep)))
744 (no-subst (not (dired--star-or-qmark-p command "?" 'keep))) 744 (no-subst (not (dired--star-or-qmark-p command "?" 'keep)))
745 (star (string-match "\\*" command))
746 (qmark (string-match "\\?" command))
747 ;; Get confirmation for wildcards that may have been meant 745 ;; Get confirmation for wildcards that may have been meant
748 ;; to control substitution of a file name or the file name list. 746 ;; to control substitution of a file name or the file name list.
749 (ok (cond ((not (or on-each no-subst)) 747 (ok (cond ((not (or on-each no-subst))