Merge branch 'fix-warning' of git://github.com/yasuyk/ninja

Conflicts:
	misc/ninja-mode.el

diff --cc misc/ninja-mode.el
index 8c6a197,cd31be6..2ab6a53
--- 1/misc/ninja-mode.el
--- 2/misc/ninja-mode.el
+++ b/misc/ninja-mode.el
@@@ -19,9 -15,7 +19,9 @@@
  ;; Simple emacs mode for editing .ninja files.
  ;; Just some syntax highlighting for now.
  
- (setq ninja-keywords
 +;;; Code:
 +
+ (defvar ninja-keywords
        (list
         '("^#.*" . font-lock-comment-face)
         (cons (concat "^" (regexp-opt '("rule" "build" "subninja" "include"