[Emacs-diffs] emacs/lisp ls-lisp.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/01/28 19:01:42

Modified files:
        lisp           : ls-lisp.el 

Log message:
        (ls-lisp-classify): Propertize file name before concatenating the type
        indicating character.
        (ls-lisp-format): Don't propertize file-name if ls-lisp-classify 
already did.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ls-lisp.el?cvsroot=emacs&r1=1.80&r2=1.81

Patches:
Index: ls-lisp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ls-lisp.el,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- ls-lisp.el  5 Jan 2009 03:19:31 -0000       1.80
+++ ls-lisp.el  28 Jan 2009 19:01:42 -0000      1.81
@@ -531,13 +531,17 @@
         (type (cadr filedata)))
     (cond (type
           (cons
-           (concat file-name (if (eq type t) "/" "@"))
+           (concat (propertize file-name 'dired-filename t)
+                   (if (eq type t) "/" "@"))
            (cdr filedata)))
          ((string-match "x" (nth 9 filedata))
           (cons
-           (concat file-name "*")
+           (concat (propertize file-name 'dired-filename t) "*")
            (cdr filedata)))
-         (t filedata))))
+         (t
+          (cons
+           (propertize file-name 'dired-filename t)
+           (cdr filedata))))))
 
 (defun ls-lisp-extension (filename)
   "Return extension of FILENAME (ignoring any version extension)
@@ -632,7 +636,9 @@
            " "
            (ls-lisp-format-time file-attr time-index now)
            " "
+           (if (not (memq ?F switches)) ; ls-lisp-classify already did that
            (propertize file-name 'dired-filename t)
+             file-name)
            (if (stringp file-type)     ; is a symbolic link
                (concat " -> " file-type))
            "\n"