From d9fdf70cce349030d621e8ff1e9dbaf0f9acc5c4 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 23 Jun 2004 09:59:33 +0000 Subject: [PATCH] Synch to No Gnus 200406230958. --- lisp/ChangeLog | 6 ++++++ lisp/gnus-cite.el | 13 ++++++++++++- texi/ChangeLog | 5 +++++ texi/gnus-ja.texi | 6 ++++++ texi/gnus.texi | 7 +++++++ 5 files changed, 36 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9ee6aa5..4ec0dc0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2004-06-23 Katsumi Yamaoka + + * gnus-cite.el (gnus-cite-ignore-quoted-from): New user option. + (gnus-cite-parse): Ignore quoted envelope From_. Suggested by + Karl Chen . + 2004-06-23 Jesper Harder * 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 --- 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 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2004-06-23 Katsumi Yamaoka + + * gnus.texi (Article Highlighting): Add + gnus-cite-ignore-quoted-from. + 2004-06-06 Lars Magne Ingebrigtsen * message.texi (Various Message Variables): Add. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index dc8d5b1..a4429e8 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -7897,6 +7897,12 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$ @vindex gnus-cite-attribution-face $BB0@-9T$K;H$o$l$k%U%'%$%9$G$9!#$=$NB0@-$KB0$9$kJ8$N$?$a$N%U%'%$%9$HM;9g$5(B $B$l$^$9!#(B + +@item gnus-cite-ignore-quoted-from +@vindex gnus-cite-ignore-quoted-from +$BHs(B-@code{nil} $B$@$C$?$i!"(B@samp{>From } $B$G;O$^$k9T$G0zMQ%O%$%i%$%H$O9T$o$l(B +$B$^$;$s!#$=$l$i$N9T$O!"%(%s%Y%m!<%W(B From $B9T$H:.F1$7$J$$$h$&$K!"(BMTA $B$,%/%*!<(B +$B%H$7$?2DG=@-$,$"$j$^$9!#%G%#%U%)%k%HCM$O(B @code{t} $B$G$9!#(B @end table @item W H s diff --git a/texi/gnus.texi b/texi/gnus.texi index 03cbbed..e29c71d 100644 --- 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 -- 1.7.10.4