[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/yaml-mode d1b8be6 039/124: Merge pull request #23 from Wil
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/yaml-mode d1b8be6 039/124: Merge pull request #23 from Wilfred/master |
Date: |
Sun, 29 Aug 2021 11:36:09 -0400 (EDT) |
branch: elpa/yaml-mode
commit d1b8be66ae7ce1de11a98812a146c082eee8e51d
Merge: fb17c37 bc66879
Author: Yoshiki Kurihara <clouder@gmail.com>
Commit: Yoshiki Kurihara <clouder@gmail.com>
Merge pull request #23 from Wilfred/master
Use the syntax table for highlighting comments.
---
yaml-mode.el | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/yaml-mode.el b/yaml-mode.el
index 33b059f..60b277b 100644
--- a/yaml-mode.el
+++ b/yaml-mode.el
@@ -120,9 +120,6 @@ that key is pressed to begin a block literal."
(defconst yaml-blank-line-re "^ *$"
"Regexp matching a line containing only (valid) whitespace.")
-(defconst yaml-comment-re "\\(?:^\\|\\s-+\\)\\(#.*\\)"
- "Regexp matching a line containing a YAML comment or delimiter.")
-
(defconst yaml-directive-re "^\\(?:--- \\)? *%\\(\\w+\\)"
"Regexp matching a line contatining a YAML directive.")
@@ -220,6 +217,7 @@ that key is pressed to begin a block literal."
"Simple mode to edit YAML.
\\{yaml-mode-map}"
+ :syntax-table yaml-mode-syntax-table
(set (make-local-variable 'comment-start) "# ")
(set (make-local-variable 'comment-start-skip) "#+ *")
(set (make-local-variable 'indent-line-function) 'yaml-indent-line)
@@ -227,26 +225,26 @@ that key is pressed to begin a block literal."
(set (make-local-variable 'font-lock-defaults)
'(yaml-font-lock-keywords
nil nil nil nil
- (font-lock-syntactic-keywords . yaml-font-lock-syntactic-keywords))))
+ (font-lock-syntactic-keywords . yaml-font-lock-syntactic-keywords)))
+ (font-lock-fontify-buffer))
;; Font-lock support
(defvar yaml-font-lock-keywords
(list
- (cons yaml-comment-re '(1 font-lock-comment-face))
(cons yaml-constant-scalars-re '(1 font-lock-constant-face))
(cons yaml-tag-re '(0 font-lock-type-face))
- (cons yaml-node-anchor-alias-re '(0 font-lock-function-name-face t))
- (cons yaml-hash-key-re '(1 font-lock-variable-name-face t))
+ (cons yaml-node-anchor-alias-re '(0 font-lock-function-name-face))
+ (cons yaml-hash-key-re '(1 font-lock-variable-name-face))
(cons yaml-document-delimiter-re '(0 font-lock-comment-face))
(cons yaml-directive-re '(1 font-lock-builtin-face))
- '(yaml-font-lock-block-literals 0 font-lock-string-face t)
+ '(yaml-font-lock-block-literals 0 font-lock-string-face)
'("^[\t]+" 0 'yaml-tab-face t))
"Additional expressions to highlight in YAML mode.")
(defvar yaml-font-lock-syntactic-keywords
- (list '(yaml-syntactic-block-literals 0 "." t))
+ (list '(yaml-syntactic-block-literals 0 "."))
"Additional syntax features to highlight in YAML mode.")
- [nongnu] elpa/yaml-mode 3fc5a33 094/124: Mark block literals to unfontify quotes in them, (continued)
- [nongnu] elpa/yaml-mode 3fc5a33 094/124: Mark block literals to unfontify quotes in them, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 41adb32 112/124: Merge pull request #77 from dgutov/single-quote-fixup, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode fea2fb0 114/124: Mention the bug report, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 97a58b3 109/124: Make sure not to pre-fill ppss cache with wrong entries, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 68fecb5 118/124: Exclude newline from `yaml-nested-map-re`, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode e142e65 008/124: added newline, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode f68472b 024/124: automatically enable yaml-mode for *.yaml files, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode cf171f4 026/124: `checkdoc' nits (including the `checkdoc-autoload' extension)., ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode e2befd8 027/124: Merge pull request #7 from SamB/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 6d40a1d 033/124: resolved conflict, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode d1b8be6 039/124: Merge pull request #23 from Wilfred/master,
ELPA Syncer <=
- [nongnu] elpa/yaml-mode 11df403 044/124: Merge pull request #30 from rhoml/enable-eyaml, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 85d5c63 050/124: allow dash-newline to start a sequence, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 6590b19 060/124: add copy of GPLv2, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 4ae92a7 062/124: Define keymap and syntax table properly, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode c757396 066/124: Remove unnecessary refontification, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 44f73b6 017/124: Add autoload comments., ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 4c1127c 037/124: Improve paragraph filling of block literals, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode d88c80a 053/124: allow spaces before dash-newline, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 4e69e6e 059/124: update address for FSF, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode a4794ea 070/124: Mark non-negative integer values for indent safe, ELPA Syncer, 2021/08/29