changeset 100098:2705d9a106f9

(dired-font-lock-keywords): Avoid fontifying file names ending in a colon as directory header.
author Andreas Schwab <schwab@suse.de>
date Mon, 01 Dec 2008 16:07:19 +0000
parents ed40fe0bf176
children d51099c8e25a
files lisp/ChangeLog lisp/dired.el
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Dec 01 12:14:03 2008 +0000
+++ b/lisp/ChangeLog	Mon Dec 01 16:07:19 2008 +0000
@@ -1,3 +1,8 @@
+2008-12-01  Andreas Schwab  <schwab@suse.de>
+
+	* dired.el (dired-font-lock-keywords): Avoid fontifying file names
+	ending in a colon as directory header.
+
 2008-12-01  Kenichi Handa  <handa@m17n.org>
 
 	* international/uni-numeric.el: Re-generated.
--- a/lisp/dired.el	Mon Dec 01 12:14:03 2008 +0000
+++ b/lisp/dired.el	Mon Dec 01 16:07:19 2008 +0000
@@ -382,9 +382,6 @@
 (defvar dired-font-lock-keywords
   (list
    ;;
-   ;; Directory headers.
-   (list dired-subdir-regexp '(1 dired-header-face))
-   ;;
    ;; Dired marks.
    (list dired-re-mark '(0 dired-mark-face))
    ;;
@@ -451,6 +448,14 @@
 		    (unless (get-text-property (1- (point)) 'mouse-face)
 		      (dired-move-to-filename)))
 	     nil (0 dired-ignored-face))))
+   ;;
+   ;; Explicitly put the default face on file names ending in a colon to
+   ;; avoid fontifying them as directory header.
+   (list (concat dired-re-maybe-mark dired-re-inode-size dired-re-perms ".*:$")
+	 '(".+" (dired-move-to-filename) nil (0 default)))
+   ;;
+   ;; Directory headers.
+   (list dired-subdir-regexp '(1 dired-header-face))
 )
   "Additional expressions to highlight in Dired mode.")