# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1258474805 -7200
# Node ID a447f47541f533a4f657618d5aae4a671a2f734c
# Parent  154d8ebf534b0c26d150e62f8ec76e8c4c980ac7# Parent  2abcea5b91db769bb1f02aae8c50bdde52440ae0
merged

diff -r 2abcea5b91db -r a447f47541f5 .emacs-my
--- a/.emacs-my	Mon Nov 16 17:53:04 2009 +0200
+++ b/.emacs-my	Tue Nov 17 18:20:05 2009 +0200
@@ -854,6 +854,11 @@
 ;; (add-to-list 'compilation-mode-font-lock-keywords '("[ 	]\\(/F[oe][^ 	]+\\)" . 1))
 
 ;; ----------------------------------------------------------------------
+;; makefile, make
+
+(add-to-list 'auto-mode-alist '("\\(Makefile\\|Makefile\\..+\\)\\'" . makefile-gmake-mode))
+
+;; ----------------------------------------------------------------------
 ;; asm
 ;; (setq-default asm-comment-char 59)
 (add-hook 'asm-mode-hook '(lambda () (setq comment-start "/*") (setq comment-end "*/")) t)