(insert-directory): Obey --dired even with symlinks.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a77f2206e58f524f079083620957e420a81d50b8..c972f8ca8abbea3af38ac17a6c49ab3758404f3c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,10 @@
+2004-09-25  Stefan  <monnier@iro.umontreal.ca>
+
+       * files.el (insert-directory): Obey --dired even with symlinks.
+
 2004-09-25  Lars Hansen  <larsh@math.ku.dk>
 
-       * ls-lisp.el (ls-lisp-format): Mark file names with poperty
+       * ls-lisp.el (ls-lisp-format): Mark file names with property
        dired-filename.
 
 2004-09-25  Kim F. Storm  <storm@cua.dk>
@@ -21,8 +25,8 @@
        it, and show completions.
        (ido-all-completions): Let bind ido-directory-too-big to nil.
        (ido-exhibit): Handle ido-directory-too-big.
-       (ido-read-buffer): Handle fallback to read-buffer.  Init
-       ido-directory-too-big.
+       (ido-read-buffer): Handle fallback to read-buffer.
+       Init ido-directory-too-big.
        (ido-read-file-name, ido-read-directory-name, ido-completing-read):
        Init ido-directory-too-big.
 

diff --git a/lisp/files.el b/lisp/files.el
index 994422fe71090d8613afc1be8e4f95bfcdda3335..ee6793bec719227d3f1348e0eccb124e46ae1f78 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4376,7 +4376,8 @@ normally equivalent short `-D' option is just passed on to
                  (while (< (point) end)
                    (let ((start (+ beg (read (current-buffer))))
                          (end (+ beg (read (current-buffer)))))
-                     (if (= (char-after end) ?\n)
+                     (if (memq (char-after end) '(?\n ?\ ))
+                         ;; End is followed by \n or by " -> ".
                          (put-text-property start end 'dired-filename t)
                        ;; It seems that we can't trust ls's output as to
                        ;; byte positions of filenames.