GNU bug report logs - #13173
[PATCH] sieve-mode.el: Keywords should be word delimited.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 13173 in the body.
You can then email your comments to 13173 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Akinori MUSHA" <knu <at> iDaemons.org>
To: bug-gnu-emacs <at> gnu.org
Subject: [PATCH] sieve-mode.el: Keywords should be word delimited.
Date: Fri, 14 Dec 2012 00:03:13 +0900

In sieve-mode, font-lock keywords will wrongly match because the
regexp patterns are unaware of word boundaries.

For example, if you put an action command "notify", it is highlighted
as "not"+"if"+y.

Apply the following simple patch to fix that.

---
 lisp/gnus/ChangeLog     | 5 +++++
 lisp/gnus/sieve-mode.el | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 601ed0c..42b3e59 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-13  Akinori MUSHA  <knu <at> iDaemons.org>
+
+	* sieve-mode.el (sieve-font-lock-keywords): Keywords should be word
+	delimited.
+
 2012-12-06  Sam Steingold  <sds <at> gnu.org>
 
 	* gnus-start.el (gnus-before-resume-hook): Add.
diff --git a/lisp/gnus/sieve-mode.el b/lisp/gnus/sieve-mode.el
index f49f767..32abbfe 100644
--- a/lisp/gnus/sieve-mode.el
+++ b/lisp/gnus/sieve-mode.el
@@ -131,14 +131,17 @@
   (eval-when-compile
     (list
      ;; control commands
-     (cons (regexp-opt '("require" "if" "else" "elsif" "stop"))
+     (cons (regexp-opt '("require" "if" "else" "elsif" "stop")
+                       'words)
 	   'sieve-control-commands-face)
      ;; action commands
-     (cons (regexp-opt '("fileinto" "redirect" "reject" "keep" "discard"))
+     (cons (regexp-opt '("fileinto" "redirect" "reject" "keep" "discard")
+                       'words)
 	   'sieve-action-commands-face)
      ;; test commands
      (cons (regexp-opt '("address" "allof" "anyof" "exists" "false"
-			 "true" "header" "not" "size" "envelope"))
+			 "true" "header" "not" "size" "envelope")
+                       'words)
 	   'sieve-test-commands-face)
      (cons "\\Sw+:\\sw+"
 	   'sieve-tagged-arguments-face))))
-- 
1.8.0.1

-- 
Akinori MUSHA / http://akinori.org/

Message #10 received at 13173-done <at> debbugs.gnu.org (full text, mbox):

From: Glenn Morris <rgm <at> gnu.org>
To: 13173-done <at> debbugs.gnu.org
Subject: Re: bug#13173: [PATCH] sieve-mode.el: Keywords should be word
	delimited.
Date: Thu, 13 Dec 2012 23:27:38 -0500

Version: 24.4

Thanks; applied.

Message #13 received at 13173 <at> debbugs.gnu.org (full text, mbox):

From: "Akinori MUSHA" <knu <at> iDaemons.org>
To: 13173 <at> debbugs.gnu.org
Subject: Re: bug#13173: closed (Re: bug#13173: [PATCH] sieve-mode.el: Keywords
	should be word delimited.)
Date: Fri, 28 Dec 2012 10:49:30 +0900

Could you merge this fix to the emacs-24 branch?

-- 
Akinori MUSHA / http://akinori.org/

Message #16 received at 13173 <at> debbugs.gnu.org (full text, mbox):

From: Glenn Morris <rgm <at> gnu.org>
To: "Akinori MUSHA" <knu <at> iDaemons.org>
Cc: 13173 <at> debbugs.gnu.org
Subject: Re: bug#13173: closed (Re: bug#13173: [PATCH] sieve-mode.el: Keywords
	should be word delimited.)
Date: Thu, 27 Dec 2012 20:52:26 -0500

"Akinori MUSHA" wrote:

> Could you merge this fix to the emacs-24 branch?

Nope, sorry. It's a long-standing piece of font-lock trivia, so I prefer
to err on the side of extreme caution and leave it for 24.4.

Message #19 received at 13173 <at> debbugs.gnu.org (full text, mbox):

From: "Akinori MUSHA" <knu <at> iDaemons.org>
To: Glenn Morris <rgm <at> gnu.org>
Cc: 13173 <at> debbugs.gnu.org
Subject: Re: bug#13173: closed (Re: bug#13173: [PATCH] sieve-mode.el: Keywords
	should be word delimited.)
Date: Fri, 28 Dec 2012 10:58:47 +0900

At Thu, 27 Dec 2012 20:52:26 -0500,
Glenn Morris wrote:
> "Akinori MUSHA" wrote:
> 
> > Could you merge this fix to the emacs-24 branch?
> 
> Nope, sorry. It's a long-standing piece of font-lock trivia, so I prefer
> to err on the side of extreme caution and leave it for 24.4.

OK.  Sorry for the bother!

-- 
Akinori MUSHA / http://akinori.org/

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.