diff options
author | Evan Martin <martine@danga.com> | 2014-01-21 18:57:29 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2014-01-21 18:57:29 (GMT) |
commit | 8d42584c29f0eb2e955870db2805335460763282 (patch) | |
tree | 044aa8b7ca511094fe39312d1c06dad0569e76af /misc | |
parent | 51c9220f533d61020e789a07d09456d7d59c101a (diff) | |
parent | 9da5b0c862326c837e7d131fadcd8866d9053922 (diff) | |
download | Ninja-8d42584c29f0eb2e955870db2805335460763282.zip Ninja-8d42584c29f0eb2e955870db2805335460763282.tar.gz Ninja-8d42584c29f0eb2e955870db2805335460763282.tar.bz2 |
Merge branch 'fix-provide-form' of git://github.com/yasuyk/ninja
Conflicts:
misc/ninja-mode.el
Diffstat (limited to 'misc')
-rw-r--r-- | misc/ninja-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/ninja-mode.el b/misc/ninja-mode.el index 2ab6a53..54b9b62 100644 --- a/misc/ninja-mode.el +++ b/misc/ninja-mode.el @@ -41,10 +41,10 @@ (setq font-lock-defaults '(ninja-keywords t)) ) -(provide 'ninja-mode) - ;; Run ninja-mode for files ending in .ninja. ;;;###autoload (add-to-list 'auto-mode-alist '("\\.ninja$" . ninja-mode)) +(provide 'ninja-mode) + ;;; ninja-mode.el ends here |