* spam-report.el (spam-report-gmane-ham): Renamed from

[gnus] / lisp / gnus-sieve.el

diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el
index 2fb82f9..d790fec 100644 (file)
--- a/lisp/gnus-sieve.el
+++ b/lisp/gnus-sieve.el
@@ -1,10 +1,11 @@
 ;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 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
@@ -18,8 +19,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -66,7 +67,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 +106,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)
@@ -128,7 +130,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)))))
@@ -226,7 +228,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")
                          "}")
@@ -235,4 +237,5 @@ This is returned as a string."
 
 (provide 'gnus-sieve)
 
+;;; arch-tag: 3b906527-c7f3-4c86-9e82-62e2697998a3
 ;;; gnus-sieve.el ends here