(dired-move-to-end-of-filename):

Handle fifo as rendered by "ls -lF": Don't include trailing "|".

2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ccc4c154971..0caf88a7861 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-18  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * dired.el (dired-move-to-end-of-filename):
+        Handle fifo as rendered by "ls -lF": Don't include trailing "|".
+
 2005-08-18  Kim F. Storm  <storm@cua.dk>
 
         * ido.el (ido-everywhere): Fix defcustom :set function to disable
diff --git a/lisp/dired.el b/lisp/dired.el
index 8d1b4fe8e7e..508bc39bbb5 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1953,11 +1953,11 @@ Return the position of the beginning of the filename, or nil if none found."
                        (eq (preceding-char) ?@) ;; did ls really mark the link?
                        (forward-char -1))))
           (goto-char eol) ;; else not a symbolic link
-          ;; ls -lF marks dirs, sockets and executables with exactly one
-          ;; trailing character. (Executable bits on symlinks ain't mean
+          ;; ls -lF marks dirs, sockets, fifos and executables with exactly
+          ;; one trailing character. (Executable bits on symlinks ain't mean
           ;; a thing, even to ls, but we know it's not a symlink.)
           (and used-F
-               (or (memq file-type '(?d ?s))
+               (or (memq file-type '(?d ?s ?p))
                    executable)
                (forward-char -1))))
       (or no-error