# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1258982644 -7200
# Node ID 1e2213b996dbba1ed8511b25039f923894b635cb
# Parent  a447f47541f533a4f657618d5aae4a671a2f734c# Parent  22dc8759aafc10984b5a2cb35d42c5dbde3795db
Automated merge with file:///d:\srv\hg-home\dot-emacs

diff -r 22dc8759aafc -r 1e2213b996db .emacs-my
--- a/.emacs-my	Mon Nov 23 15:24:02 2009 +0200
+++ b/.emacs-my	Mon Nov 23 15:24:04 2009 +0200
@@ -852,6 +852,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)