# HG changeset patch
# User Daniel Pfeiffer <occitan@esperanto.org>
# Date 1151867149 0
# Node ID 0cfdb902c3181f893c2284e790a3af5b3f18e046
# Parent  e0adef75745fc8d7e04f4466655d5b610bbdcf89
*** empty log message ***

diff -r e0adef75745f -r 0cfdb902c318 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jul 02 19:01:34 2006 +0000
+++ b/lisp/ChangeLog	Sun Jul 02 19:05:49 2006 +0000
@@ -1,3 +1,12 @@
+2006-07-02  Daniel Pfeiffer  <occitan@esperanto.org>
+
+	* progmodes/make-mode.el (makefile-macroassign-regex): Accept
+	preceding keyword.
+	(makefile-gmake-statements): Reorganize, now that makepp has
+	"override" and also handle forgotten "override define".
+	(makefile-makepp-statements): Add new "global", "override export"
+	and "override global".
+
 2006-06-30  Juanma Barranquero  <lekktu@gmail.com>
 
 	* progmodes/ada-mode.el (ada-which-compiler, ada-mode-menu)