27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
|
|
Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
|
|
|
|
This patch adds highlighting for (guix) G-Expressions.
|
|
|
|
diff --git a/highlight-stages.el b/highlight-stages.el
|
|
index 3094c3c..e11260e 100644
|
|
--- a/highlight-stages.el
|
|
+++ b/highlight-stages.el
|
|
@@ -237,14 +237,14 @@ non-nil, (match-string 0) must be the expression matched."
|
|
|
|
(defun highlight-stages-lisp-quote-matcher (&optional limit)
|
|
(when (highlight-stages--search-forward-regexp
|
|
- "\\(?:`\\|\\(#?'\\)\\)\\|([\s\t\n]*\\(?:backquote\\|\\(quote\\)\\)[\s\t\n]+" limit)
|
|
+ "\\(?:`\\|\\(#?'\\)\\)\\|([\s\t\n]*\\(?:backquote\\|\\(quote\\)\\)[\s\t\n]+\\|\\(?:#~\\)\\|([\s\t\n]*\\(?:gexp\\)[\s\t\n]+" limit)
|
|
(prog1 (if (or (match-beginning 1) (match-beginning 2)) 'real t)
|
|
(set-match-data
|
|
(list (point)
|
|
(progn (ignore-errors (forward-sexp 1)) (point)))))))
|
|
|
|
(defun highlight-stages-lisp-escape-matcher (&optional limit)
|
|
- (when (highlight-stages--search-forward-regexp ",@?\\|([\s\t\n]*\\\\,@?+[\s\t\n]+" limit)
|
|
+ (when (highlight-stages--search-forward-regexp ",@?\\|([\s\t\n]*\\\\,@?+[\s\t\n]+\\|\\(unquote\\)\\|\\(unquote-splicing\\)\\|\\(ungexp-native\\)\\|\\(ungexp-splicing\\)\\|\\(ungexp-native-splicing\\)\\|\\(ungexp\\)\\|#\\$" limit)
|
|
(set-match-data
|
|
(list (point)
|
|
(progn (ignore-errors (forward-sexp 1)) (point))))
|