From debe7ba9bde1fed10f4e9668000a96c82ad7a33d Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Thu, 9 Apr 2015 16:52:22 -0400 Subject: Fix broken regexps When switching to rx in the last commit (38e5bfec0147), I unintentionally changed two regular expressions, which broke imenu indexing and highlighting for top-level keywords and rules. --- snakemake-mode.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/snakemake-mode.el b/snakemake-mode.el index c445a0b..929f3bd 100644 --- a/snakemake-mode.el +++ b/snakemake-mode.el @@ -83,7 +83,7 @@ (defconst snakemake-rule-or-subworkflow-re (rx (group symbol-start (or "rule" "subworkflow")) " " - (one-or-more (or (syntax word) (syntax symbol))) + (group (one-or-more (or (syntax word) (syntax symbol)))) ":") "Regexp matching a rule or subworkflow.") @@ -95,8 +95,7 @@ (rx line-start (group (or "include" "workdir" "ruleorder" "configfile" "onsuccess" "onerror")) - ":" (zero-or-more space) - line-end) + ":" (zero-or-more space)) "Regexp matching other toplevel commands aside from 'rule'.") (defconst snakemake-field-key-re -- cgit v1.2.3