# HG changeset patch
# User stephent
# Date 1016078068 0
# Node ID 703228f54913068de250da8a3f346b1b9242f6b0
# Parent  4bc4fecf15da0d735be672979b1d8484bc90890d
[xemacs-hg @ 2002-03-14 03:54:10 by stephent]
Ville Skytta's auto-mode additions <1016058402.2852.39.camel@bobcat.ods.org>
ChangeLog placeholders <87it7zu7wj.fsf@tleepslib.sk.tsukuba.ac.jp>

diff -r 4bc4fecf15da -r 703228f54913 ChangeLog
--- a/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.
diff -r 4bc4fecf15da -r 703228f54913 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/lib-src/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.
diff -r 4bc4fecf15da -r 703228f54913 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/lisp/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,12 @@
+2002-03-14  Ville Skyttä  <ville.skytta@xemacs.org>
+
+	* files.el (auto-mode-alist): GNUmakefile is a Makefile,
+	"system default" Xdefaults and friends get xrdb-mode.
+
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.
diff -r 4bc4fecf15da -r 703228f54913 lisp/files.el
--- a/lisp/files.el	Wed Mar 13 10:16:26 2002 +0000
+++ b/lisp/files.el	Thu Mar 14 03:54:28 2002 +0000
@@ -1301,8 +1301,8 @@
     ("configure\\.\\(in\\|ac\\)\\'" . autoconf-mode)
     ("\\.ml\\'" . lisp-mode)
     ("\\.ma?ke?\\'" . makefile-mode)
-    ("[Mm]akefile\\(\\.\\|\\'\\)" . makefile-mode)
-    ("\\.X\\(defaults\\|environment\\|resources\\|modmap\\)\\'" . xrdb-mode)
+    ("\\(GNU\\)?[Mm]akefile\\(\\.\\|\\'\\)" . makefile-mode)
+    ("[./\\]X\\(defaults\\|environment\\|resources\\|modmap\\)\\'" . xrdb-mode)
     ;; #### The following three are Unix-specific (but do we care?)
     ("/app-defaults/" . xrdb-mode)
     ("\\.[^/]*wm2?\\(?:rc\\)?\\'" . winmgr-mode)
diff -r 4bc4fecf15da -r 703228f54913 lwlib/ChangeLog
--- a/lwlib/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/lwlib/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.
diff -r 4bc4fecf15da -r 703228f54913 man/ChangeLog
--- a/man/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/man/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.
diff -r 4bc4fecf15da -r 703228f54913 modules/ChangeLog
--- a/modules/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/modules/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.
diff -r 4bc4fecf15da -r 703228f54913 netinstall/ChangeLog
--- a/netinstall/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/netinstall/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.
@@ -397,7 +401,7 @@
 
 	* all: port from cygwin setup.
 
-%%% $Id: ChangeLog,v 1.13 2002/03/05 14:45:58 stephent Exp $
-$Revision: 1.13 $
+%%% $Id: ChangeLog,v 1.14 2002/03/14 03:54:21 stephent Exp $
+$Revision: 1.14 $
 
 
diff -r 4bc4fecf15da -r 703228f54913 nt/ChangeLog
--- a/nt/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/nt/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.
diff -r 4bc4fecf15da -r 703228f54913 nt/installer/Wise/ChangeLog
--- a/nt/installer/Wise/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/nt/installer/Wise/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.
diff -r 4bc4fecf15da -r 703228f54913 src/ChangeLog
--- a/src/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/src/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-01-31  John H. Palmieri  <palmieri@math.washington.edu>
 
 	* dired.c (Ffile_name_all_completions): Change documentation --
diff -r 4bc4fecf15da -r 703228f54913 tests/ChangeLog
--- a/tests/ChangeLog	Wed Mar 13 10:16:26 2002 +0000
+++ b/tests/ChangeLog	Thu Mar 14 03:54:28 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-12  Ben Wing  <ben@xemacs.org>
+
+	* The Great Mule Merge: placeholder.
+
 2002-03-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.5 "beets" is released.