From 11377a46d103f788982e9a190c50a8526b9a6b80 Mon Sep 17 00:00:00 2001 From: Fanael Linithien Date: Sun, 23 Nov 2014 16:05:48 +0100 Subject: Correctly recognize a comment if the previous line is a comment ending in $. --- misc/ninja-mode.el | 11 +++++++++-- 1 file 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. -- cgit v0.12