(insert-directory): Don't treat FILE as a wildcard if FILE exists as

a directory.

lisp/ChangeLog

@@ -1,3 +1,8 @@
+2007-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* ls-lisp.el (insert-directory): Don't treat FILE as a wildcard if
+	FILE exists as a directory.
+
 2007-06-22  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc/calc.el (math-bignum-digit-length)

lisp/ls-lisp.el

@@ -229,7 +229,10 @@ that work are: A a c i r S s t u U X g G B C R and F partly."
 	;; `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)))))