From: yamaoka <yamaoka>
Date: Wed, 19 Feb 2003 22:15:52 +0000 (+0000)
Subject: Synch to Oort Gnus.
X-Git-Tag: t-gnus-6_15_17-00-quimby~57
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c190ec86220d0e6fe01e796850b7868c8f725155;p=elisp%2Fgnus.git-

Synch to Oort Gnus.
---

diff --git a/ChangeLog b/ChangeLog
index cab9be5..50029be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-19  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* GNUS-NEWS: Renamed `gnus-unsightly-citation-regexp' to
+	`gnus-cite-unsightly-citation-regexp'.
+
 2003-02-18  Simon Josefsson  <jas@extundo.com>
 
 	* GNUS-NEWS: Talk about canlock more.
diff --git a/GNUS-NEWS b/GNUS-NEWS
index 8923bb2..b399c7b 100644
--- a/GNUS-NEWS
+++ b/GNUS-NEWS
@@ -10,10 +10,11 @@ For older news, see Gnus info node "New Features".
 
 ** Better handling of Microsoft citation styles
 
-Gnus now tries to recognize the mangled header block that some
-Microsoft mailers use to indicate that the rest of the message is a
-citation, even though it is not quoted in any way.  The variable
-`gnus-unsightly-citation-regexp' matches the start of these citations.
+Gnus now tries to recognize the mangled header block that some Microsoft
+mailers use to indicate that the rest of the message is a citation, even
+though it is not quoted in any way.  The variable
+`gnus-cite-unsightly-citation-regexp' matches the start of these
+citations.
 
 ** gnus-article-skip-boring
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9548590..50a99c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-19  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-cite.el (gnus-cite-unsightly-citation-regexp)
+	(gnus-cite-parse): Renamed `gnus-unsightly-citation-regexp' to
+	`gnus-cite-unsightly-citation-regexp'.
+
 2003-02-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-msg.el (gnus-copy-article-buffer): Copy an article header
diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index b47c74e..8a9f141 100644
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -121,7 +121,7 @@ The text matching the first grouping will be used as a button."
   :group 'gnus-cite
   :type 'regexp)
 
-(defcustom gnus-unsightly-citation-regexp
+(defcustom gnus-cite-unsightly-citation-regexp
   "^-----Original Message-----\nFrom: \\(.+\n\\)+\n"
   "Regexp matching Microsoft-type rest-of-message citations."
   :group 'gnus-cite
@@ -750,7 +750,7 @@ See also the documentation for `gnus-article-highlight-citation'."
       (setq line (1+ line)))
     ;; Horrible special case for some Microsoft mailers.
     (goto-char (point-min))
-    (when (re-search-forward gnus-unsightly-citation-regexp max t)
+    (when (re-search-forward gnus-cite-unsightly-citation-regexp max t)
       (setq begin (count-lines (point-min) (point)))
       (setq end (count-lines (point-min) max))
       (setq entry nil)