Copyright © 2017 Oleg Pykhalov Copyright © 2017 Ludovic Courtès 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)))) /guix/diff/tests/build-utils.scm?id=98b4fb8dab5fa26ae18304a5526210d6ca33b535'>diff
AgeCommit message (Expand)Author
2024-08-31build: utils: Raise error in modify-phases upon missing key....* guix/build/utils.scm (alist-cons-before) (alist-cons-after): Error with a match failure if the reference is not found, instead of appending to the alist. * tests/build-utils.scm: Update tests to match the new behavior. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: I3044b101bd06231d5cd55a544ac1009e6ce6f9a0 Carlo Zancanaro