[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108163: * lisp/files.el (auto-mode-alist): Treat ".make" like ".mk".

[Glenn Morris]

------------------------------------------------------------
revno: 108163
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-08 13:23:09 -0400
message:
  * lisp/files.el (auto-mode-alist): Treat ".make" like ".mk".
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-08 15:19:18 +0000
+++ b/lisp/ChangeLog    2012-05-08 17:23:09 +0000
@@ -1,3 +1,7 @@
+2012-05-08  Glenn Morris  <address@hidden>
+
+       * files.el (auto-mode-alist): Treat ".make" like ".mk".
+
 2012-05-08  Stefan Monnier  <address@hidden>
 
        * vc/log-edit.el: Add GNU coding standards highlighting.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-05-05 03:21:47 +0000
+++ b/lisp/files.el     2012-05-08 17:23:09 +0000
@@ -2262,9 +2262,11 @@
      ("\\.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