Mercurial > emacs
diff lisp/ls-lisp.el @ 107276:2dee04cb649f
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 11 Feb 2010 21:54:28 +0000 |
parents | 68c91c0692df |
children | 988b3f9a342a cda2045a5ee8 |
line wrap: on
line diff
--- a/lisp/ls-lisp.el Tue Feb 09 21:54:40 2010 +0000 +++ b/lisp/ls-lisp.el Thu Feb 11 21:54:28 2010 +0000 @@ -400,6 +400,7 @@ ;; 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)))