From: Glenn Morris Date: Tue, 8 May 2012 17:23:09 +0000 (-0400) Subject: * lisp/files.el (auto-mode-alist): Treat ".make" like ".mk". X-Git-Tag: emacs-24.2.90~471^2~152 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ad89bb83f7cb57b77cc30f5f8805013b0bd4ab10;p=emacs.git * lisp/files.el (auto-mode-alist): Treat ".make" like ".mk". --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3d275acd46c..3988ed707c3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-05-08 Glenn Morris + + * files.el (auto-mode-alist): Treat ".make" like ".mk". + 2012-05-08 Stefan Monnier * vc/log-edit.el: Add GNU coding standards highlighting. diff --git a/lisp/files.el b/lisp/files.el index f2302c2dd48..7ee0707d7b7 100644 --- 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