# HG changeset patch
# User Daniel Pfeiffer <occitan@esperanto.org>
# Date 1148972520 0
# Node ID 82fa54a4612c24b5db30b3b83b7bcce2778e67e2
# Parent  861f9f0d261eeb7fd7e4b1b63346a092dc8b3462
*** empty log message ***

diff -r 861f9f0d261e -r 82fa54a4612c lisp/ChangeLog
--- a/lisp/ChangeLog	Tue May 30 07:00:37 2006 +0000
+++ b/lisp/ChangeLog	Tue May 30 07:02:00 2006 +0000
@@ -1,3 +1,11 @@
+2006-05-30  Daniel Pfeiffer  <occitan@esperanto.org>
+
+	* files.el (auto-mode-alist): Add makepp suffix and optional mk on
+	Makeppfile.
+
+	* progmodes/compile.el (compilation-error-regexp-alist-alist): Add
+	makepp diagnostic.
+
 2006-05-29  Richard Stallman  <rms@gnu.org>
 
 	* help.el (temp-buffer-max-height): Doc fix.