From: Daniel Pfeiffer <occitan@esperanto.org>
Date: Tue, 30 May 2006 06:59:56 +0000 (+0000)
Subject: (auto-mode-alist): Add makepp suffix and optional mk on Makeppfile.
X-Git-Tag: emacs-pretest-22.0.90~2186
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8088bb2ca517e6c7942550f96714e84a692589f2;p=emacs.git

(auto-mode-alist): Add makepp suffix and optional mk on Makeppfile.
---

diff --git a/lisp/files.el b/lisp/files.el
index 9f15e35e987..b4bc8f9ffec 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1847,13 +1847,14 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.ad[bs].dg\\'" . ada-mode)
      ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode)
      ("Imakefile\\'" . makefile-imake-mode)
+     ("Makeppfile\\(?:\\.mk\\)?\\'" . makefile-makepp-mode) ; Put this before .mk
+     ("\\.makepp\\'" . makefile-makepp-mode)
      ,@(if (memq system-type '(berkeley-unix next-mach darwin))
 	   '(("\\.mk\\'" . makefile-bsdmake-mode)
 	     ("GNUmakefile\\'" . makefile-gmake-mode)
 	     ("[Mm]akefile\\'" . makefile-bsdmake-mode))
 	 '(("\\.mk\\'" . makefile-gmake-mode)	; Might be any make, give Gnu the host advantage
 	   ("[Mm]akefile\\'" . makefile-gmake-mode)))
-     ("Makeppfile\\'" . makefile-makepp-mode)
      ("\\.am\\'" . makefile-automake-mode)
      ;; Less common extensions come here
      ;; so more common ones above are found faster.