[Emacs-diffs] /srv/bzr/emacs/trunk r100592: Revert 2010-06-02 change to log-edit-font-lock-keywords (Bug#6343).

[Chong Yidong]

------------------------------------------------------------
revno: 100592
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-06-12 13:14:43 -0400
message:
  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).
modified:
  lisp/ChangeLog
  lisp/vc/log-edit.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-12 17:12:15 +0000
+++ b/lisp/ChangeLog    2010-06-12 17:14:43 +0000
@@ -1,10 +1,13 @@
 2010-06-12  Chong Yidong  <address@hidden>
 
+       * 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  <address@hidden>
 

=== modified file 'lisp/vc/log-edit.el'
--- a/lisp/vc/log-edit.el       2010-06-11 19:09:57 +0000
+++ b/lisp/vc/log-edit.el       2010-06-12 17:14:43 +0000
@@ -360,7 +360,7 @@
       (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)