diff options
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/ls-lisp.el | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9da3daaebc4..47aaa51deb6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2009-01-28 Eli Zaretskii <eliz@gnu.org> + + * ls-lisp.el (ls-lisp-classify): Propertize file name before + concatenating the type indicating character. + (ls-lisp-format): Don't propertize file-name only if + ls-lisp-classify already did. + 2009-01-28 Michael Albinus <michael.albinus@gmx.de> * net/dbus.el (dbus-event-error-hooks): Fix docstring. Describe diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 7c9c9e61688..0374b9bbaed 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -531,13 +531,17 @@ for directory, string (name linked to) for symbolic link, or nil." (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 @@ SWITCHES, TIME-INDEX and NOW give the full switch list and time data." " " (ls-lisp-format-time file-attr time-index now) " " - (propertize file-name 'dired-filename t) + (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" |