Mercurial > emacs
changeset 78039:ed97a96f45fc
(insert-directory): Don't treat FILE as a wildcard if FILE exists as
a directory.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 23 Jun 2007 09:51:18 +0000 |
| parents | 7332bae5b7e7 |
| children | f39d2bac5438 |
| files | lisp/ls-lisp.el |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ls-lisp.el Thu Jun 21 22:55:44 2007 +0000 +++ b/lisp/ls-lisp.el Sat Jun 23 09:51:18 2007 +0000 @@ -229,7 +229,10 @@ ;; `ls' don't mind, we certainly do, because it makes us think ;; there is no wildcard, only a directory name. (if (and ls-lisp-support-shell-wildcards - (string-match "[[?*]" file)) + (string-match "[[?*]" file) + ;; Prefer an existing directory to wildcards, like + ;; dired-noselect does. + (not (file-directory-p file))) (progn (or (not (eq (aref file (1- (length file))) ?/)) (setq file (substring file 0 (1- (length file)))))