[Emacs-diffs] Changes to emacs/lisp/files.el

[Daniel Pfeiffer]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.771 emacs/lisp/files.el:1.772
*** emacs/lisp/files.el:1.771   Mon May 16 11:33:46 2005
--- emacs/lisp/files.el Sat May 21 02:42:00 2005
***************
*** 1744,1750 ****
    (mapc
     (lambda (elt)
       (cons (purecopy (car elt)) (cdr elt)))
!    '(;; 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)
--- 1744,1750 ----
    (mapc
     (lambda (elt)
       (cons (purecopy (car elt)) (cdr elt)))
!    `(;; 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,1770 ****
       ("\\.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)
       ("Makeppfile\\'" . makefile-makepp-mode)
       ("\\.am\\'" . makefile-automake-mode)
       ;; Less common extensions come here
--- 1762,1773 ----
       ("\\.ad[abs]\\'" . ada-mode)
       ("\\.ad[bs].dg\\'" . ada-mode)
       ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-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