procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(ls-lisp-classify): Propertize file name before concatenating the type

Browse source 
indicating character.
(ls-lisp-format): Don't propertize file-name if ls-lisp-classify already did.
This commit is contained in:
Eli Zaretskii 2009-01-28 19:02:17 +00:00
parent f213fc091d
commit 40077a525f
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -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

14
lisp/ls-lisp.el
View file

@ -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"