diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2009-01-28 19:02:17 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2009-01-28 19:02:17 +0000 |
| commit | 40077a525feeed248f54e99d42b57272fed6dc5e (patch) | |
| tree | 6590252e5d1ddf06d2ea58ebc96c3805e02fe95d /lisp/ls-lisp.el | |
| parent | f213fc091d1a93eb0606786670ae67f89a1129cf (diff) | |
| download | emacs-40077a525feeed248f54e99d42b57272fed6dc5e.tar.gz | |
(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.
Diffstat (limited to 'lisp/ls-lisp.el')
| -rw-r--r-- | lisp/ls-lisp.el | 14 |
1 files changed, 10 insertions, 4 deletions
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" |