* lisp/files.el (auto-mode-alist): Treat ".make" like ".mk".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d275acd46ca4ba2dec44464a367976897a50b3e..3988ed707c3f22c4a413547a5dbcd3d92ef22a24 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-08  Glenn Morris  <rgm@gnu.org>
+
+       * files.el (auto-mode-alist): Treat ".make" like ".mk".
+
 2012-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc/log-edit.el: Add GNU coding standards highlighting.

diff --git a/lisp/files.el b/lisp/files.el
index f2302c2dd48caab89fb36709eff8081c39ec594b..7ee0707d7b78bb78225fa7f4b0d32573c3ec857a 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2262,9 +2262,11 @@ since only a single case-insensitive search through the alist is made."
      ("\\.makepp\\'" . makefile-makepp-mode)
      ,@(if (memq system-type '(berkeley-unix darwin))
           '(("\\.mk\\'" . makefile-bsdmake-mode)
+            ("\\.make\\'" . 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
+          ("\\.make\\'" . makefile-gmake-mode)
           ("[Mm]akefile\\'" . makefile-gmake-mode)))
      ("\\.am\\'" . makefile-automake-mode)
      ;; Less common extensions come here