# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1116605702 0
# Node ID 6d3be100a1333a87bb45aa96ece49d36960ad9f9
# Parent  efeaec0ce9c4a5504a01818330ebb3edc3d50625
Fix braino.

diff -r efeaec0ce9c4 -r 6d3be100a133 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 20 15:30:59 2005 +0000
+++ b/lisp/ChangeLog	Fri May 20 16:15:02 2005 +0000
@@ -3,6 +3,23 @@
 	* emacs-lisp/easymenu.el (easy-menu-add): Correct docstring since
 	easy-menu-add is not a nop on Emacs; and clarify when to call it.
 
+2005-05-20  Lute Kamstra  <lute@gnu.org>
+
+	* diff-mode.el (diff-header-face, diff-file-header-face)
+	(diff-index-face, diff-hunk-header-face, diff-removed-face)
+	(diff-added-face, diff-changed-face, diff-function-face)
+	(diff-context-face, diff-nonexistent-face): Put them in the
+	diff-mode customization group.
+
+2005-05-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/vhdl-mode.el (vhdl-font-lock-match-item): Simplify regexp.
+
+	* progmodes/sh-script.el (sh-mode, sh-get-word): Minor regexp fixes.
+
+	* font-lock.el (lisp-font-lock-keywords-2): Don't error.
+	Minor regexp-optimization.
+
 2005-05-20  Carsten Dominik  <dominik@science.uva.nl>
 
 	* textmodes/org.el (org-agenda-toggle-time-grid): New command.