diff options
| author | Bastien | 2017-07-03 09:09:31 +0200 |
|---|---|---|
| committer | Bastien | 2017-07-03 09:09:31 +0200 |
| commit | 1e60ee871ddade4fe091b38fcfa5e4b685695b2b (patch) | |
| tree | e966b56232a52c582d09ec48d0f3c69b15f14e11 /lisp | |
| parent | 5ca1888fe670aee7febd4d42665d7372ab2ffebc (diff) | |
| parent | bc3dcd524dfb5c889ed017c093eaf028596fc35c (diff) | |
| download | emacs-1e60ee871ddade4fe091b38fcfa5e4b685695b2b.tar.gz emacs-1e60ee871ddade4fe091b38fcfa5e4b685695b2b.zip | |
Merge branch 'master' into scratch/org-mode-merge
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/dired-aux.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 12a97f8457e..e4547758587 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el | |||
| @@ -738,7 +738,7 @@ can be produced by `dired-get-marked-files', for example." | |||
| 738 | ;; Drop all ? and * surrounded by spaces and `?`. | 738 | ;; Drop all ? and * surrounded by spaces and `?`. |
| 739 | (while (and (string-match regexp res) | 739 | (while (and (string-match regexp res) |
| 740 | (dired--star-or-qmark-p res str)) | 740 | (dired--star-or-qmark-p res str)) |
| 741 | (setq res (replace-match "" t t res 0))) | 741 | (setq res (replace-match "" t t res 2))) |
| 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))) |