Synch to No Gnus 200406230958.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ee6aa5..4ec0dc0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-cite.el (gnus-cite-ignore-quoted-from): New user option.
+       (gnus-cite-parse): Ignore quoted envelope From_.  Suggested by
+       Karl Chen <quarl@nospam.quarl.org>.
+
 2004-06-23  Jesper Harder  <harder@ifa.au.dk>
 
        * message.el (message-idna-to-ascii-rhs-1): Don't choke on

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 7de2998..7e72ab0 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
@@ -128,6 +128,13 @@ The text matching the first grouping will be used as a button."
   :group 'gnus-cite
   :type 'regexp)
 
+(defcustom gnus-cite-ignore-quoted-from t
+  "Non-nil means don't regard lines beginning with \">From \" as cited text.
+Those lines may have been quoted by MTAs in order not to mix up with
+the envelope From line."
+  :group 'gnus-cite
+  :type 'boolean)
+
 (defface gnus-cite-attribution-face '((t
                                       (:italic t)))
   "Face used for attribution lines.")
@@ -740,6 +747,10 @@ See also the documentation for `gnus-article-highlight-citation'."
       ;; Ignore very long prefixes.
       (when (> end (+ begin gnus-cite-max-prefix))
        (setq end (+ begin gnus-cite-max-prefix)))
+      ;; Ignore quoted envelope From_.
+      (when (and gnus-cite-ignore-quoted-from
+                (looking-at ">from "))
+       (setq end (1+ begin)))
       (while (re-search-forward prefix-regexp (1- end) t)
        ;; Each prefix.
        (setq end (match-end 0)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 8accd8d..ed3a6c7 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (Article Highlighting): Add
+       gnus-cite-ignore-quoted-from.
+
 2004-06-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * message.texi (Various Message Variables): Add.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index dc8d5b1..a4429e8 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -7897,6 +7897,12 @@ Fonts})\e$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"\e(Bgnus \e$B$O$=$l$
 @vindex gnus-cite-attribution-face
 \e$BB0@-9T$K;H$o$l$k%U%'%$%9$G$9!#$=$NB0@-$KB0$9$kJ8$N$?$a$N%U%'%$%9$HM;9g$5\e(B
 \e$B$l$^$9!#\e(B
+
+@item gnus-cite-ignore-quoted-from
+@vindex gnus-cite-ignore-quoted-from
+\e$BHs\e(B-@code{nil} \e$B$@$C$?$i!"\e(B@samp{>From } \e$B$G;O$^$k9T$G0zMQ%O%$%i%$%H$O9T$o$l\e(B
+\e$B$^$;$s!#$=$l$i$N9T$O!"%(%s%Y%m!<%W\e(B From \e$B9T$H:.F1$7$J$$$h$&$K!"\e(BMTA \e$B$,%/%*!<\e(B
+\e$B%H$7$?2DG=@-$,$"$j$^$9!#%G%#%U%)%k%HCM$O\e(B @code{t} \e$B$G$9!#\e(B
 @end table
 
 @item W H s

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 03cbbed..e29c71d 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -8144,6 +8144,13 @@ Regexp matching the end of an attribution line.
 Face used for attribution lines.  It is merged with the face for the
 cited text belonging to the attribution.
 
+@item gnus-cite-ignore-quoted-from
+@vindex gnus-cite-ignore-quoted-from
+If non-@code{nil}, no citation highlighting will be performed on lines
+beginning with @samp{>From }.  Those lines may have been quoted by MTAs
+in order not to mix up with the envelope From line.  The default value
+is @code{t}.
+
 @end table