X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-sieve.el;h=3f600146cbfc5b134a6d9365beb0db37753ef747;hb=55c26cf1a9939dc7b28fcbab35f1d05d56d53242;hp=e3477de6e6087da6a94609ce2cf254f61651ba24;hpb=74b3d8c1c16d0f18e5213d097f79232ebf4aeb1a;p=gnus

diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el
index e3477de6e..3f600146c 100644
--- a/lisp/gnus-sieve.el
+++ b/lisp/gnus-sieve.el
@@ -1,25 +1,24 @@
 ;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+
+;; Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: NAGY Andras <nagya@inf.elte.hu>,
 ;;	Simon Josefsson <simon@josefsson.org>
 
-;; This file is not part of GNU Emacs, but the same permissions apply.
+;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -64,9 +63,9 @@ your Sieve script."
 For example: \"nnimap:mailbox\""
   :group 'gnus-sieve)
 
-(defcustom gnus-sieve-crosspost nil
+(defcustom gnus-sieve-crosspost t
   "Whether the generated Sieve script should do crossposting."
-  :type 'bool
+  :type 'boolean
   :group 'gnus-sieve)
 
 (defcustom gnus-sieve-update-shell-command "echo put %f | sieveshell %s"
@@ -105,22 +104,23 @@ See the documentation for these variables and functions for details."
   (require 'sieve)
   (find-file gnus-sieve-file)
   (goto-char (point-min))
-  (if (re-search-forward
-       (concat (regexp-quote gnus-sieve-region-start) "\\(.\\|\n\\)*"
-	       (regexp-quote gnus-sieve-region-end)) nil t)
-      (delete-region (match-beginning 0) (match-end 0))
+  (if (re-search-forward (regexp-quote gnus-sieve-region-start) nil t)
+      (delete-region (match-beginning 0)
+		     (or (re-search-forward (regexp-quote
+					     gnus-sieve-region-end) nil t)
+			 (point)))
     (insert sieve-template))
   (insert gnus-sieve-region-start
 	  (gnus-sieve-script gnus-sieve-select-method gnus-sieve-crosspost)
-	  gnus-sieve-region-end)
-  (sieve-mode))
+	  gnus-sieve-region-end))
 
 (defun gnus-sieve-guess-rule-for-article ()
   "Guess a sieve rule based on RFC822 article in buffer.
-Return NIL if no rule could be guessed."
+Return nil if no rule could be guessed."
   (when (message-fetch-field "sender")
-    `(sieve address "sender" ,(regexp-quote (message-fetch-field "sender")))))
+    `(sieve address "sender" ,(message-fetch-field "sender"))))
 
+;;;###autoload
 (defun gnus-sieve-article-add-rule ()
   (interactive)
   (gnus-summary-select-article nil 'force)
@@ -128,7 +128,7 @@ Return NIL if no rule could be guessed."
     (let ((rule (gnus-sieve-guess-rule-for-article))
 	  (info (gnus-get-info gnus-newsgroup-name)))
       (if (null rule)
-	  (error "Could not guess rule for article.")
+	  (error "Could not guess rule for article")
 	(gnus-info-set-params info (cons rule (gnus-info-params info)))
 	(message "Added rule in group %s for article: %s" gnus-newsgroup-name
 		 rule)))))
@@ -202,9 +202,8 @@ considered.  This parameter should contain an elisp test
 such group, a Sieve IF control structure is generated, having the
 test as the condition and { fileinto \"group.name\"; } as the body.
 
-If CROSSPOST is non-nil, concatenate these conditionals
-sequencially, otherwsie with `elsif', causing a match on one group the
-other tests to be skipped.
+If CROSSPOST is nil, each conditional body contains a \"stop\" command
+which stops execution after a match is found.
 
 For example: If the INBOX.list.sieve group has the
 
@@ -220,16 +219,19 @@ This is returned as a string."
   (let* ((newsrc (cdr gnus-newsrc-alist))
 	 script)
     (dolist (info newsrc)
-      (when (or (not method) 
+      (when (or (not method)
 		(gnus-server-equal method (gnus-info-method info)))
 	(let* ((group (gnus-info-group info))
 	       (spec (gnus-group-find-parameter group 'sieve t)))
 	  (when spec
-	    (push (concat "if " (gnus-sieve-test spec) " {\n\t"
-			  "fileinto \"" (gnus-group-real-name group) 
-			  "\";\n}")
+	    (push (concat "if " (gnus-sieve-test spec) " {\n"
+			  "\tfileinto \"" (gnus-group-real-name group) "\";\n"
+			  (if crosspost
+			      ""
+			    "\tstop;\n")
+			  "}")
 		  script)))))
-    (mapconcat 'identity script (if crosspost "\n" "\nels"))))
+    (mapconcat 'identity script "\n")))
 
 (provide 'gnus-sieve)