From: Chong Yidong Date: Sat, 12 Jun 2010 17:14:43 +0000 (-0400) Subject: Revert 2010-06-02 change to log-edit-font-lock-keywords (Bug#6343). X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~60 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=133a8d82eae71487045937d15c11264f28cd5507;p=emacs.git 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 ba066a7f651..c33ed04e0c2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,10 +1,13 @@ 2010-06-12 Chong Yidong + * 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 diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index c3a28937170..27290eeec8a 100644 --- 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)