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)))) ref='/guix/diff/gnu/packages/emacs.scm?id=6781127a0b31e8b5709655f603ad72e1b5aff2b4'>diff
path: root/gnu/packages/emacs.scm
AgeCommit message (Expand)Author
2024-10-06gnu: emacs-next: Update to 30.0.91-1.9a1c76b....* gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.91-1.9a1c76b. Change-Id: Iba274ab45deea9edc4049b0cec2716655ba3e148 Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com> Arto Jantunen
2024-09-03gnu: emacs-minimal: Do not native-compile lisp/transient.el....* gnu/packages/emacs.scm (emacs-minimal)[#:phases]: Add ‘disable-native-compilation’ to turn off native-compilation for the file lisp/transient.el. Change-Id: I27c9d660cbad46be66df641816e4596346969dfc Fixes: transient-prefix-object is void <https://issues.guix.gnu.org/72333>. Reported-by: Daniel Szmulewicz <daniel.szmulewicz@gmail.com> Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com> Simon Tournier
2024-07-21gnu: emacs-minimal: Ungraft....The current graft breaks native compilation and would do so even if reduced to an ABI hash. Thus remove it, and rebuild all Emacsen. * gnu/packages/emacs.scm (emacs-minimal): Update to 29.4. [replacement]: Remove. Add note for future replacements. (emacs-minimal/fixed): Remove variable. Fixes: Emacs native compilation across grafts <https://bugs.gnu.org/72045> Liliana Marie Prikler
2024-07-07gnu: emacs-next: Update to 30.0.60-1.4e22ef8....* gnu/packages/aux-files/emacs/comp-integrity-next.el: New file. * Makefile.am (AUX_FILES): Register it here. * gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.60-1.4e22ef8. (emacs->emacs-next)[arguments]: Swap out ‘validate-comp-integrity’ phase, so as to refer to the new integrity check. Liliana Marie Prikler
2024-06-23Revert "gnu: emacs: Update to 29.4. (security fixes)"...This reverts commit 7e15704613b67ec54df8f1269916bc72b76bb785. It causes rebuilds to all of emacs-*, whereas a graft has already been applied in 868a022cdca164941a6fe8dcf205aefc693781cb. Liliana Marie Prikler
2024-06-23gnu: emacs: Update to 29.4. (security fixes)...This fixes an issue where org-mode would run arbitrary shell code on startup. See <https://lists.gnu.org/archive/html/emacs-devel/2024-06/msg00695.html> for the release announcement. * gnu/packages/emacs.scm (emacs-minimal): Update to 29.4. Liliana Marie Prikler
2024-06-23gnu: emacs-minimal: Graft with 29.4 [security fixes]....Arbitrary shell commands are no longer run when turning on Org mode. This is for security reasons, to avoid running malicious commands. * gnu/packages/emacs.scm (emacs-minimal/fixed): New variable. (emacs-minimal)[replacement]: Graft. Change-Id: Idb74ee0a05486bfe5052c4dd804fbdaec8921774 Zheng Junjie