From: Andreas Schwab <schwab@suse.de>
Date: Mon, 1 Dec 2008 16:07:19 +0000 (+0000)
Subject: (dired-font-lock-keywords): Avoid fontifying file names
X-Git-Tag: emacs-pretest-23.0.90~1386
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5dad58ad421536e6d4e1d854aa1fd4bf275bbb2;p=emacs.git

(dired-font-lock-keywords): Avoid fontifying file names
ending in a colon as directory header.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58f1bafd2a6..18577e7b81c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/dired.el b/lisp/dired.el
index f4087b1323e..2cb5d86a904 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -381,9 +381,6 @@ Subexpression 2 must end right before the \\n or \\r.")
 
 (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 @@ Subexpression 2 must end right before the \\n or \\r.")
 		    (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.")