From e2a17b365b7d6de700a42e44cd53c16d5c5f1821 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 23 Apr 2003 23:09:15 +0000
Subject: [PATCH] Synch to Oort Gnus 200304231953.

---
 lisp/ChangeLog     |   11 +++++++++++
 lisp/gnus-art.el   |    3 +--
 lisp/gnus-msg.el   |    3 ---
 lisp/gnus-sieve.el |    9 +++++----
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 238c786..e9b06d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-23  Simon Josefsson  <jas@extundo.com>
+
+	* gnus-sieve.el (gnus-sieve-generate): Rewrite regexp search so it
+	doesn't exceed the regexp stack space.
+
+2003-04-23  Jesper Harder  <harder@ifa.au.dk>
+
+	* gnus-msg.el (gnus-inews-mark-gcc-as-read): Don't defvar it.
+
+	* gnus-art.el (gnus-article-hide-pgp-hook): do.
+
 2003-04-23  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* mml.el (mml-preview): Bind `=', RET, and mouse-2.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 264c33a..0f2d28c 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -612,8 +612,7 @@ The following additional specs are available:
   :type 'hook
   :group 'gnus-article-various)
 
-(defvar gnus-article-hide-pgp-hook nil)
-(make-obsolete-variable 'gnus-article-hide-pgp-hook 
+(make-obsolete-variable 'gnus-article-hide-pgp-hook
 			"This variable is obsolete in Gnus 5.10.")
 
 (defcustom gnus-article-button-face 'bold
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 609d642..726cd8c 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -172,9 +172,6 @@ See Info node `(gnus)Posting Styles'."
   :group 'gnus-message
   :type 'boolean)
 
-(defvar gnus-inews-mark-gcc-as-read nil
-  "Obsolete variable. Use `gnus-gcc-mark-as-read' instead.")
-
 (make-obsolete-variable 'gnus-inews-mark-gcc-as-read
 			'gnus-gcc-mark-as-read)
 
diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el
index d8133a7..b11ade5 100644
--- a/lisp/gnus-sieve.el
+++ b/lisp/gnus-sieve.el
@@ -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)
-- 
1.7.10.4