* ls-lisp.el (ls-lisp-insert-directory): Wen WILDCARD-REGEXP and

FULL-DIRECTORY-P are nil, and FILE is absolute, expand it.  This
prevents file names like "~/" been listed literally.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4699aa64aa0565384ebf55db50d9e37b7027380..d1adb4be5907c815df9aacc62032e284a1d37411 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-10  Michael Albinus  <michael.albinus@gmx.de>
+
+       * ls-lisp.el (ls-lisp-insert-directory): Wen WILDCARD-REGEXP and
+       FULL-DIRECTORY-P are nil, and FILE is absolute, expand it.  This
+       prevents file names like "~/" been listed literally.
+
 2010-02-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * term/xterm.el (xterm-maybe-set-dark-background-mode): Remove

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 284e9db97ee1870e76c65e1ae871bba5c578c46c..2e06155846651a75ab8b67869e579e69f951d513 100644 (file)
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -400,6 +400,7 @@ not contain `d', so that a full listing is expected."
     ;; If not full-directory-p, FILE *must not* end in /, as
     ;; file-attributes will not recognize a symlink to a directory,
     ;; so must make it a relative filename as ls does:
+    (if (file-name-absolute-p file) (setq file (expand-file-name file)))
     (if (eq (aref file (1- (length file))) ?/)
        (setq file (substring file 0 -1)))
     (let ((fattr (file-attributes file 'string)))