Revert 2010-06-02 change to log-edit-font-lock-keywords (Bug#6343).

* vc/log-edit.el (log-edit-font-lock-keywords): Revert 2010-06-02
change temporarily (Bug#6343).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba066a7f651b9288a82565ee54ca2fb9eaae5ea5..c33ed04e0c2ad55a5cf0758e5b3a6fa93fbd00ad 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,13 @@
 2010-06-12  Chong Yidong  <cyd@stupidchicken.com>
 
+       * term/common-win.el (x-colors): Add all the color names defined
+       in rgb.txt (Bug#6332).
+
        * facemenu.el (list-colors-print): Don't print extra names if it
        will overflow the window width.
 
        * vc/log-edit.el (log-edit-font-lock-keywords): Revert 2010-06-02
-       change temporarily (Bug#6343).
+       change (Bug#6343).
 
 2010-06-12  Eli Zaretskii  <eliz@gnu.org>
 

diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index c3a2893717048395ed544afe66f76ebe9a25365c..27290eeec8aae5f213b8daacc19ca6ddc2447a74 100644 (file)
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -360,7 +360,7 @@ automatically."
       (3 (or (cdr (assoc (match-string 2) log-edit-headers-alist))
              'log-edit-header)
          nil lax)
-      (4 font-lock-warning-face nil lax)))))
+      (4 font-lock-warning-face)))))
 
 ;;;###autoload
 (defun log-edit (callback &optional setup params buffer mode &rest ignore)