From: yamaoka <yamaoka>
Date: Sun, 6 Jun 2004 23:42:16 +0000 (+0000)
Subject: Synch to No Gnus 200406061948.
X-Git-Tag: t-gnus-6_17_4-quimby-~876
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01f48fc0ef1b00f481c24066da939b4fcfe21009;p=elisp%2Fgnus.git-

Synch to No Gnus 200406061948.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07cf868..a05155a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* message.el (message-cite-articles-with-x-no-archive): New
+	variable. 
+	(message-cite-original): Use it.
+
 2004-06-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* message.el (message-cite-original): Respect X-No-Archive. 
diff --git a/lisp/message.el b/lisp/message.el
index baede90..ba81415 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1269,6 +1269,11 @@ starting with `not' and followed by regexps."
   :link '(custom-manual "(message)Message Headers")
   :type '(repeat regexp))
 
+(defcustom message-cite-articles-with-x-no-archive t
+  "If non-nil, cite text from articles that has X-No-Archive set."
+  :group 'message
+  :type 'boolean)
+
 ;;; Internal variables.
 ;;; Well, not really internal.
 
@@ -3602,6 +3607,7 @@ be added to the \"References\" field."
 	  (insert "\n"))
 	(funcall message-citation-line-function))
       (when (and x-no-archive
+		 message-cite-articles-with-x-no-archive
 		 (string-match "yes" x-no-archive))
 	(undo-boundary)
 	(delete-region (point) (mark t))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 11fb5c0..8accd8d 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* message.texi (Various Message Variables): Add.
+
 2004-06-02  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus.texi (Mail Source Customization): Clarify
diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index 59de236..b154478 100644
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -1996,6 +1996,13 @@ gnus $B$,F0:n$7$F$$$J$$$H$-$K(B Message $B$,%P%C%U%!$r<+F0J]B8$9$k%G%#%l%/%H%
 @vindex message-mode-syntax-table
 $B%a%C%;!<%8%b!<%I%P%C%U%!$G;H$o$l$k9=J8%F!<%V%k$G$9!#(B
 
+@item message-cite-articles-with-x-no-archive
+@vindex message-cite-articles-with-x-no-archive
+$BHs(B-@code{nil} $B$@$C$?$i!"(B@samp{X-No-Archive} $B$r@_Dj$7$?5-;v$+$i0zMQ$5$l$?(B
+$B%F%-%9%H$r<h$j=|$-$^$;$s!#$3$NJQ?t$,%;%C%H$5$l$F$$$J$/$F$b!"(B
+@code{undo} $B$N%-!<A`:n$r9T$J$&$3$H$K$h$C$F<h$j=|$+$l$?0zMQ$5$l$?%F%-%9%H(B
+$B$r85$KLa$9$3$H$,$G$-$^$9!#(B
+
 @item message-strip-special-text-properties
 @vindex message-strip-special-text-properties
 Emacs $B$O%a%C%;!<%8:n@.$r$$$m$$$m$K2u$7$F$7$^$&$3$H$,$G$-$kB?$/$N%F%-%9%H(B
diff --git a/texi/message.texi b/texi/message.texi
index b81a2a3..7f7710a 100644
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -2004,6 +2004,12 @@ Hook run when canceling news articles.
 @vindex message-mode-syntax-table
 Syntax table used in message mode buffers.
 
+@item message-cite-articles-with-x-no-archive
+@vindex message-cite-articles-with-x-no-archive
+If non-@code{nil}, don't strip quoted text from articles that have
+@samp{X-No-Archive} set.  Even if this variable isn't set, you can
+undo the stripping by hitting the @code{undo} keystroke.
+
 @item message-strip-special-text-properties
 @vindex message-strip-special-text-properties
 Emacs has a number of special text properties which can break message
@@ -2041,7 +2047,6 @@ A function to be called if @var{predicate} returns non-@code{nil}.
 @end lisp
 
 
-
 @end table