summaryrefslogtreecommitdiffstats
path: root/misc/ninja-mode.el
diff options
context:
space:
mode:
authorFanael Linithien <fanael4@gmail.com>2014-11-23 15:05:48 (GMT)
committerFanael Linithien <fanael4@gmail.com>2014-11-23 21:25:27 (GMT)
commit11377a46d103f788982e9a190c50a8526b9a6b80 (patch)
treee919a30156881351c1b9179d92a8e22e39d03a00 /misc/ninja-mode.el
parent73f934e88679fee031f971554a7b79d640fb28f5 (diff)
downloadNinja-11377a46d103f788982e9a190c50a8526b9a6b80.zip
Ninja-11377a46d103f788982e9a190c50a8526b9a6b80.tar.gz
Ninja-11377a46d103f788982e9a190c50a8526b9a6b80.tar.bz2
Correctly recognize a comment if the previous line is a comment ending in $.
Diffstat (limited to 'misc/ninja-mode.el')
-rw-r--r--misc/ninja-mode.el11
1 files changed, 9 insertions, 2 deletions
diff --git a/misc/ninja-mode.el b/misc/ninja-mode.el
index 330eba7..4802ef1 100644
--- a/misc/ninja-mode.el
+++ b/misc/ninja-mode.el
@@ -52,8 +52,15 @@
(when (and
;; Is it the first non-white character on the line?
(eq match-pos (save-excursion (back-to-indentation) (point)))
- ;; Are we *not* continuing the previous line?
- (not (eq ?$ (char-before (line-end-position 0)))))
+ (save-excursion
+ (goto-char (line-end-position 0))
+ (or
+ ;; If we're continuting the previous line, it's not a
+ ;; comment.
+ (not (eq ?$ (char-before)))
+ ;; Except if the previous line is a comment as well, as the
+ ;; continuation dollar is ignored then.
+ (nth 4 (syntax-ppss)))))
(put-text-property match-pos (1+ match-pos) 'syntax-table '(11))
(let ((line-end (line-end-position)))
;; Avoid putting properties past the end of the buffer.