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

[Daniel Pfeiffer]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.775 emacs/lisp/files.el:1.776
*** emacs/lisp/files.el:1.775   Fri Jun 10 14:02:21 2005
--- emacs/lisp/files.el Tue Jun 14 07:33:01 2005
***************
*** 1766,1777 ****
       ("\\.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
--- 1766,1777 ----
       ("\\.ad[abs]\\'" . ada-mode)
       ("\\.ad[bs].dg\\'" . ada-mode)
       ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode)
       ,@(if (memq system-type '(berkeley-unix next-mach darwin))
           '(("\\.mk\\'" . 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
!          ("[Mm]akefile\\'" . makefile-gmake-mode)))
       ("Makeppfile\\'" . makefile-makepp-mode)
       ("\\.am\\'" . makefile-automake-mode)
       ;; Less common extensions come here