X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-sieve.el;h=376dd4277a0827c841e8c18cf6679ea17484d912;hb=27ec8693a5d1d67366103f333204d4e07336c22d;hp=106160cfe62a2920ed70b3261faddb1dc6b2a5bd;hpb=64eebf8623718340cf188e244d3f1a04fd1e1716;p=gnus diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el index 106160cfe..376dd4277 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-2011 Free Software Foundation, Inc. ;; Author: NAGY Andras , ;; Simon Josefsson -;; 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 . ;;; Commentary: @@ -66,7 +65,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 +104,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-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) @@ -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)))))