[Emacs-diffs] /srv/bzr/emacs/trunk r99476: * ls-lisp.el (ls-lisp-insert-directory): Wen WILDCARD-REGEXP and

[Michael Albinus]

------------------------------------------------------------
revno: 99476
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-10 09:46:54 +0100
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/ls-lisp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-10 05:33:17 +0000
+++ b/lisp/ChangeLog    2010-02-10 08:46:54 +0000
@@ -1,3 +1,9 @@
+2010-02-10  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * term/xterm.el (xterm-maybe-set-dark-background-mode): Remove

=== modified file 'lisp/ls-lisp.el'
--- a/lisp/ls-lisp.el   2010-01-13 08:35:10 +0000
+++ b/lisp/ls-lisp.el   2010-02-10 08:46:54 +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)))