(auto-mode-alist, interpreter-mode-alist): Set up the new variants of makefile-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af10efb5c2d22d0d0647f1443c3be3f3d01e7e3a..11fd1eb9359b0a30767064561e5913c3c1569526 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,30 @@
+2005-05-13  Daniel Pfeiffer  <occitan@esperanto.org>
+
+       * progmodes/make-mode.el (makefile-targets-face)
+       (makefile-shell-face, makefile-makepp-perl-face): New faces.
+       (makefile-dependency-regex): Fix it to not make the colon in
+       $(var:a=b) special.
+       (makefile-rule-action-regex): New regexp for highlighting embedded
+       Shell strings.
+       (makefile-macroassign-regex): Handle != for highlighting as
+       embedded Shell strings.
+       (makefile-var-use-regex): New const.
+       (makefile-statements, makefile-automake-statements)
+       (makefile-gmake-statements, makefile-makepp-statements)
+       (makefile-bsdmake-statements): New consts.
+       (makefile-make-font-lock-keywords): New function.
+       (makefile-automake-font-lock-keywords)
+       (makefile-gmake-font-lock-keywords)
+       (makefile-makepp-font-lock-keywords)
+       (makefile-bsdmake-font-lock-keywords): New consts.
+       (makefile-mode-map): Add switchers between the various submodes.
+       (makefile-mode): Document the availability of the variants.
+       (makefile-automake-mode, makefile-gmake-mode)
+       (makefile-makepp-mode, makefile-bsdmake-mode): New derived modes.
+
+       * files.el (auto-mode-alist, interpreter-mode-alist): Set up the
+       new variants of makefile-mode.
+
 2005-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * font-lock.el (font-lock-comment-delimiter-face): Fix up

diff --git a/lisp/files.el b/lisp/files.el
index e08381cdccb36eae38d222fae6f3ae89a381ce2d..16438b780730570815bba24ba2e2bdff02142a03 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1762,9 +1762,11 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.ad[abs]\\'" . ada-mode)
      ("\\.ad[bs].dg\\'" . ada-mode)
      ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode)
-     ("\\.mk\\'" . makefile-mode)
-     ("\\([Mm]\\|GNUm\\)akep*file\\'" . makefile-mode)
-     ("\\.am\\'" . makefile-mode)      ;For Automake.
+     ("\\.mk\\'" . makefile-gmake-mode)        ; Might be any make, give Gnu the host advantage
+     ("[Mm]akefile\\'" . makefile-mode)
+     ("GNUmakefile\\'" . makefile-gmake-mode)
+     ("Makeppfile\\'" . makefile-makepp-mode)
+     ("\\.am\\'" . makefile-automake-mode)
      ;; Less common extensions come here
      ;; so more common ones above are found faster.
      ("\\.texinfo\\'" . texinfo-mode)
@@ -1936,7 +1938,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
      ("more" . text-mode)
      ("less" . text-mode)
      ("pg" . text-mode)
-     ("make" . makefile-mode)          ; Debian uses this
+     ("make" . makefile-gmake-mode)            ; Debian uses this
      ("guile" . scheme-mode)
      ("clisp" . lisp-mode)))
   "Alist mapping interpreter names to major modes.