X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fgnus-sieve.el;h=824e66ce46dfbdeef00bad1763ac25cb23244002;hb=dfb605b7b9d3597628c6f69189dc18c3c5df9b96;hp=36c99d076abe7253efddaee8a01c1f1d7fb76a50;hpb=3738187cad20787b5b99c4061256e30e19ee721a;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el
index 36c99d0..824e66c 100644
--- a/lisp/gnus-sieve.el
+++ b/lisp/gnus-sieve.el
@@ -1,10 +1,10 @@
 ;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2003 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
 ;; it under the terms of the GNU General Public License as published by
@@ -66,7 +66,7 @@ For example: \"nnimap:mailbox\""
 
 (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,10 +105,11 @@ 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-end 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)
@@ -118,7 +119,7 @@ See the documentation for these variables and functions for details."
   "Guess a sieve rule based on RFC822 article in buffer.
 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 ()
@@ -219,14 +220,14 @@ 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"
 			  "\tfileinto \"" (gnus-group-real-name group) "\";\n"
-			  (if gnus-sieve-crosspost
+			  (if crosspost
 			      ""
 			    "\tstop;\n")
 			  "}")