summaryrefslogtreecommitdiff
path: root/lisp/ls-lisp.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2010-02-10 09:46:54 +0100
committerMichael Albinus <michael.albinus@gmx.de>2010-02-10 09:46:54 +0100
commita8e4290b05511059af4e48988e58cbda85f5cd59 (patch)
treeb017748c07d71790490e65468f3100a0b9087931 /lisp/ls-lisp.el
parentc59d6fadf77535f3ecb36fec13271ee0a97a65b3 (diff)
downloademacs-a8e4290b05511059af4e48988e58cbda85f5cd59.tar.gz
emacs-a8e4290b05511059af4e48988e58cbda85f5cd59.tar.bz2
emacs-a8e4290b05511059af4e48988e58cbda85f5cd59.zip
* 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.
Diffstat (limited to 'lisp/ls-lisp.el')
-rw-r--r--lisp/ls-lisp.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 284e9db97ee..2e061558466 100644
--- 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)))