# HG changeset patch # User Daniel Pfeiffer # Date 1116643320 0 # Node ID ec0b3f67cb692067afe7b2a3fc3ffe834ee74efa # Parent 48398831c4740cd99416e75f6fcd620332509118 (auto-mode-alist): Check GNUmakefile before makefile. Default to makefile-bsdmake-mode on BSD systems. diff -r 48398831c474 -r ec0b3f67cb69 lisp/files.el --- a/lisp/files.el Fri May 20 22:39:33 2005 +0000 +++ b/lisp/files.el Sat May 21 02:42:00 2005 +0000 @@ -1744,7 +1744,7 @@ (mapc (lambda (elt) (cons (purecopy (car elt)) (cdr elt))) - '(;; do this first, so that .html.pl is Polish html, not Perl + `(;; do this first, so that .html.pl is Polish html, not Perl ("\\.s?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode) ("\\.te?xt\\'" . text-mode) ("\\.[tT]e[xX]\\'" . tex-mode) @@ -1762,9 +1762,12 @@ ("\\.ad[abs]\\'" . ada-mode) ("\\.ad[bs].dg\\'" . ada-mode) ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode) - ("\\.mk\\'" . makefile-gmake-mode) ; Might be any make, give Gnu the host advantage - ("[Mm]akefile\\'" . makefile-mode) ("GNUmakefile\\'" . makefile-gmake-mode) + ,@(if (memq system-type '(berkeley-unix next-mach darwin)) + '(("\\.mk\\'" . makefile-bsdmake-mode) + ("[Mm]akefile\\'" . makefile-bsdmake-mode)) + '(("\\.mk\\'" . makefile-gmake-mode) ; Might be any make, give Gnu the host advantage + ("[Mm]akefile\\'" . makefile-mode))) ("Makeppfile\\'" . makefile-makepp-mode) ("\\.am\\'" . makefile-automake-mode) ;; Less common extensions come here