summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2014-01-21 18:56:43 (GMT)
committerEvan Martin <martine@danga.com>2014-01-21 18:56:43 (GMT)
commit51c9220f533d61020e789a07d09456d7d59c101a (patch)
tree0f87b08b11a56f986b44ea547a64506b8bd3ec0a
parent1c41be988b6ee250b412a8e3fb4e55ce617a30f9 (diff)
parent8596ba60814f2ca57bf4969253b09807b4f3cac4 (diff)
downloadNinja-51c9220f533d61020e789a07d09456d7d59c101a.zip
Ninja-51c9220f533d61020e789a07d09456d7d59c101a.tar.gz
Ninja-51c9220f533d61020e789a07d09456d7d59c101a.tar.bz2
Merge branch 'fix-warning' of git://github.com/yasuyk/ninja
Conflicts: misc/ninja-mode.el
-rw-r--r--misc/ninja-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/ninja-mode.el b/misc/ninja-mode.el
index 8c6a197..2ab6a53 100644
--- a/misc/ninja-mode.el
+++ b/misc/ninja-mode.el
@@ -21,7 +21,7 @@
;;; Code:
-(setq ninja-keywords
+(defvar ninja-keywords
(list
'("^#.*" . font-lock-comment-face)
(cons (concat "^" (regexp-opt '("rule" "build" "subninja" "include"