diff lisp/files.el @ 774:703228f54913

[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>
author stephent
date Thu, 14 Mar 2002 03:54:28 +0000
parents 943eaba38521
children 79940b592197
line wrap: on
line diff
--- 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)