[Emacs-diffs] emacs/lisp ChangeLog dired.el

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/12/01 16:07:23

Modified files:
        lisp           : ChangeLog dired.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14898&r2=1.14899
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired.el?cvsroot=emacs&r1=1.412&r2=1.413

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14898
retrieving revision 1.14899
diff -u -b -r1.14898 -r1.14899
--- ChangeLog   1 Dec 2008 12:14:03 -0000       1.14898
+++ ChangeLog   1 Dec 2008 16:07:19 -0000       1.14899
@@ -1,3 +1,8 @@
+2008-12-01  Andreas Schwab  <address@hidden>
+
+       * dired.el (dired-font-lock-keywords): Avoid fontifying file names
+       ending in a colon as directory header.
+
 2008-12-01  Kenichi Handa  <address@hidden>
 
        * international/uni-numeric.el: Re-generated.

Index: dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired.el,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -b -r1.412 -r1.413
--- dired.el    8 Nov 2008 14:24:54 -0000       1.412
+++ dired.el    1 Dec 2008 16:07:23 -0000       1.413
@@ -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.")