[Emacs-diffs] Changes to emacs/lisp/ls-lisp.el,v [EMACS_22_BASE]

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Eli Zaretskii <eliz>    07/06/23 09:51:18

Index: ls-lisp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ls-lisp.el,v
retrieving revision 1.63.2.1
retrieving revision 1.63.2.2
diff -u -b -r1.63.2.1 -r1.63.2.2
--- ls-lisp.el  16 May 2007 11:24:16 -0000      1.63.2.1
+++ ls-lisp.el  23 Jun 2007 09:51:18 -0000      1.63.2.2
@@ -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)))))