X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-sieve.el;h=b11ade5bc70ab93a0b7db1c6b1d04bf2c7c6e83c;hb=c5f7362aa49943397fec729fdcfca40679946ec8;hp=18300ed8596dfb077aee9289c9900cc15e0fc9f4;hpb=4a9268a5cbbcc7c74fc6fa94d7a3409cda1d6dbf;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el
index 18300ed..b11ade5 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
@@ -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 ()
@@ -226,7 +227,7 @@ This is returned as a string."
 	  (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")
 			  "}")