diff options
| author | Daniel Pfeiffer <occitan@esperanto.org> | 2005-05-21 02:42:00 +0000 |
|---|---|---|
| committer | Daniel Pfeiffer <occitan@esperanto.org> | 2005-05-21 02:42:00 +0000 |
| commit | 813731b3dc55a2e92b29a2ef656353cbf20faa6e (patch) | |
| tree | 6c5774db03ea8aa601b35a1403ce09e2bd8fe3aa /lisp/files.el | |
| parent | ed8060d98f3c8281663d4d4d83e0c0ff2b4b9df4 (diff) | |
| download | emacs-813731b3dc55a2e92b29a2ef656353cbf20faa6e.tar.gz | |
(auto-mode-alist): Check GNUmakefile before makefile. Default to makefile-bsdmake-mode on BSD systems.
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el index d519f041152..4602b4e1efa 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1744,7 +1744,7 @@ in that case, this function acts as if `enable-local-variables' were t." (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 @@ in that case, this function acts as if `enable-local-variables' were t." ("\\.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 |