From 88908d55e0ce020f9cbdfc2a505b27f43a863554 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 2 Oct 2015 17:25:40 +0300 Subject: emacs: devel: Fix 'modify-phases' highlighting. * emacs/guix-devel.el (guix-devel-modify-phases-font-lock-pre): Handle the case when 'modify-phases' is commented. --- emacs/guix-devel.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'emacs') diff --git a/emacs/guix-devel.el b/emacs/guix-devel.el index 2e85a7edae..1f760b6ee5 100644 --- a/emacs/guix-devel.el +++ b/emacs/guix-devel.el @@ -132,8 +132,12 @@ This function is used as a MATCHER for `font-lock-keywords'." "Skip the next sexp, and return the end point of the current list. This function is used as a PRE-MATCH-FORM for `font-lock-keywords' to find 'modify-phases' keywords." - (ignore-errors (forward-sexp)) - (save-excursion (up-list) (point))) + (let ((in-comment? (nth 4 (syntax-ppss)))) + ;; If 'modify-phases' is commented, do not try to search for its + ;; keywords. + (unless in-comment? + (ignore-errors (forward-sexp)) + (save-excursion (up-list) (point))))) (defvar guix-devel-font-lock-keywords `((,(rx (or "#~" "#$" "#$@" "#+" "#+@")) . -- cgit v1.2.3