Mercurial > emacs
changeset 108980:c3dddc8e5767
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).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 12 Jun 2010 13:14:43 -0400 |
| parents | 6d1b80d173b3 |
| children | b7963ca9e06e |
| files | lisp/ChangeLog lisp/vc/log-edit.el |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jun 12 13:12:15 2010 -0400 +++ b/lisp/ChangeLog Sat Jun 12 13:14:43 2010 -0400 @@ -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>
--- a/lisp/vc/log-edit.el Sat Jun 12 13:12:15 2010 -0400 +++ b/lisp/vc/log-edit.el Sat Jun 12 13:14:43 2010 -0400 @@ -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)