[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/jade-mode 8f2959ef79 093/128: Merge pull request #43 from
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/jade-mode 8f2959ef79 093/128: Merge pull request #43 from tjefferson08/fix_comment_again |
Date: |
Sat, 29 Jan 2022 08:24:50 -0500 (EST) |
branch: elpa/jade-mode
commit 8f2959ef79b55a7428b3c41b9630aeb245454977
Merge: 9907c897e7 bbaf2bb3a1
Author: Travis Jefferson <tjefferson@signpost.com>
Commit: Travis Jefferson <tjefferson@signpost.com>
Merge pull request #43 from tjefferson08/fix_comment_again
add a THIRD comment type and use THAT as default
---
example.jade | 3 ++-
jade-mode.el | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/example.jade b/example.jade
index 69f9376ecc..dc8efa47a6 100644
--- a/example.jade
+++ b/example.jade
@@ -12,7 +12,8 @@ html(lang="en", class = ['classOne', 'classTwo'].join(','))
li
#content
// here is a real comment
- -// here is another real comment, this is probably a better default
+ -// here is another real comment
+ //- here is a THIRD real comment syntax (what?) (this one is
documented)
a(href = 'http://www.google.com') http://www.google.com
- if (youAreUsingJade)
p You are amazing
diff --git a/jade-mode.el b/jade-mode.el
index a7a9af9518..2874cd94e5 100644
--- a/jade-mode.el
+++ b/jade-mode.el
@@ -87,7 +87,7 @@
("\\(?:^[ {2,}]*\\(?:[a-z0-9_:\\-]*\\)\\)?\\(#[A-Za-z0-9\-\_]*[^ ]\\)" 1
font-lock-variable-name-face) ;; id
("\\(?:^[ {2,}]*\\(?:[a-z0-9_:\\-]*\\)\\)?\\(\\.[A-Za-z0-9\-\_]*\\)" 1
font-lock-type-face) ;; class name
("^[ \t]*\\([a-zA-Z0-9]+\\)" 1 font-lock-function-name-face) ;; tag name
- ("^\\s-*\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
+ ("^[ \t]*\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
;; remove highlighting from literal content following tag/class/id
;; e.g. tag Inner text
@@ -350,8 +350,8 @@ region defined by BEG and END."
(setq major-mode 'jade-mode)
;; comment syntax
- (set (make-local-variable 'comment-start) "-// ")
- (set (make-local-variable 'comment-start-skip) "-//\\s-*")
+ (set (make-local-variable 'comment-start) "//- ")
+ (set (make-local-variable 'comment-start-skip) "//-\\s-*")
(setq-default jade-tab-width 2)
(setq-local indent-line-function 'jade-indent-line)
- [nongnu] elpa/jade-mode efb86f6a36 101/128: Merge pull request #51 from tjefferson08/fix_compile_warnings, (continued)
- [nongnu] elpa/jade-mode efb86f6a36 101/128: Merge pull request #51 from tjefferson08/fix_compile_warnings, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode c017b86026 117/128: Fix Grammar error in Flycheck sentence., ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 334faaa998 127/128: fix small typo, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode e9cc84aff7 020/128: use mark-active instead of region-active-p, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode d259953442 030/128: Change doctype facename to font-lock-comment-face., ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode c2a826f61b 031/128: Change id facename to font-lock-variable-name-face., ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode ed4275a1f8 047/128: Merge pull request #10 from telaviv/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 33bad1d74e 065/128: Merge pull request #28 from Sterlingg/DedentFix, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 573f954c7e 025/128: set indent-tabs-mode as nil, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 6707074e67 073/128: Merge pull request #32 from tjefferson08/20_single_quote_highlighting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 8f2959ef79 093/128: Merge pull request #43 from tjefferson08/fix_comment_again,
ELPA Syncer <=
- [nongnu] elpa/jade-mode ba002b5e03 072/128: [#20] fix basic issue of single-quote highlighting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode ecc1253196 111/128: Merge pull request #56 from MC-Escherichia/fix-regexes, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode cfd25bce3e 125/128: Merge pull request #70 from wasamasa/fix-mode-definition, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 111460b056 126/128: Merge pull request #71 from phikal/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 4079475e60 029/128: Modify comment for font-lock-keywords matcher., ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode d2c37c960b 060/128: Merge pull request #22 from Niluge-KiWi/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 86f0734689 055/128: add init.el boilerplate for flymake support in the README, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode b33e7017f7 052/128: Defvar instead of setq, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode fd1a442556 059/128: Add missing jade keywords "block append", "block prepend", "append" and "prepend", ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 992ed1e50d 046/128: single quoted strings are now properly highlighted., ELPA Syncer, 2022/01/29