auto upstream

2 files changed, 11 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 052c0324734..cfdb44b9961 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-14  Akinori MUSHA  <knu@iDaemons.org>  (tiny change)
+
+        * sieve-mode.el (sieve-font-lock-keywords):
+        Keywords should be word delimited.  (Bug#13173)
+
 2012-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-article-browse-html-parts): Use <div align="left">
diff --git a/lisp/gnus/sieve-mode.el b/lisp/gnus/sieve-mode.el
index f49f767d791..32abbfef4db 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))))