From: yamaoka <yamaoka>
Date: Thu, 21 Mar 2002 22:59:47 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_6-01-quimby~4
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a41a5b2dd8e60004b7ca27566f9a8a5900c6ee1;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff192b2..c0a597f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2002-03-21  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* message.el (message-fix-before-sending): Add an option that
+	ignores illegible text.
+	Trivial change from Mark Milhollan <mlm@attglobal.net>
+	
+	* message.el (message-font-lock-keywords): Support multi-line MML
+	tags.
+	
+	* gnus-sum.el (gnus-print-buffer): Remove gnus-decoration.
+	Trivial change from lorentey@elte.hu (L,Bu(Brentey K,Ba(Broly)
+
 2002-03-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-sum.el (gnus-summary-make-menu-bar): Use intern'ed function
@@ -71,7 +83,7 @@
 	duplication.
 	(gnus-summary-save-parts-type-history): Ditto.
 	(gnus-summary-save-parts-last-directory): Ditto.
-	From: andre@slamdunknetworks.com
+	Trivial change from andre@slamdunknetworks.com
 
 2002-03-09  Paul Jarc  <prj@po.cwru.edu
 
@@ -156,7 +168,7 @@
 
 	* message.el (message-mode): If buffer-file-name, don't set auto
 	save file name.
-	From Geoff Greene <ggreene@wpi.edu>
+	Trivial change from Geoff Greene <ggreene@wpi.edu>
 
 2002-03-02  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index d9cddf3..213489a 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8267,6 +8267,7 @@ to save in."
 	  (copy-to-buffer buffer (point-min) (point-max))
 	  (set-buffer buffer)
 	  (gnus-article-delete-invisible-text)
+	  (gnus-remove-text-with-property 'gnus-decoration)
 	  (when (gnus-visual-p 'article-highlight 'highlight)
 	    ;; Copy-to-buffer doesn't copy overlay.  So redo
 	    ;; highlight.
diff --git a/lisp/message.el b/lisp/message.el
index 4ba9730..2a35784 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3224,6 +3224,7 @@ used to distinguish whether the invisible text is a MIME part or not."
 	       "Illegible text found. Continue posting? "
 	       '((?d "Remove and continue posting")
 		 (?r "Replace with dots and continue posting")
+		 (?i "Ignore and continue posting")
 		 (?e "Continue editing"))))
 	(if (eq choice ?e)
 	  (error "Illegible text found"))
@@ -3236,9 +3237,11 @@ used to distinguish whether the invisible text is a MIME part or not."
 			   (memq (char-charset char)
 				 '(eight-bit-control eight-bit-graphic
 						     control-1)))))
-	    (delete-char 1)
-	    (if (eq choice ?r)
-		(insert ".")))
+	    (if (eq choice ?i)
+		(remove-text-properties (point) (1+ (point)) '(highlight t))
+	      (delete-char 1)
+	      (if (eq choice ?r)
+		  (insert "."))))
 	  (forward-char)
 	  (skip-chars-forward mm-7bit-chars))))))
 
diff --git a/texi/ChangeLog b/texi/ChangeLog
index d1bc400..b51e8dc 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,7 +1,12 @@
+2002-03-21  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* message.texi (Sending Variables): Fix typo.
+	Trivial change from Raymond Scholz <rscholz@zonix.de>
+
 2002-03-09  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus.texi (Other Marks): Remove duplication.
-	From: David Aspinwall <aspinwall@timesten.com>
+	Trivial change from David Aspinwall <aspinwall@timesten.com>
 
 2002-03-09  Paul Jarc  <prj@po.cwru.edu>
 
diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index 5620d36..278b870 100644
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -1650,7 +1650,7 @@ follows this line--} $B$G$9!#(B
 been posted to %s as well.\n\n"} $B$G$9!#(B
 
 @c @item message-fcc-externalize-attachments
-@c @vindex message-gcc-externalize-attachments
+@c @vindex message-fcc-externalize-attachments
 @c If @code{nil}, attach files as normal parts in Fcc copies; if it is
 @c non-@code{nil}, attach local files as external parts.
 @end table
diff --git a/texi/message.texi b/texi/message.texi
index c17e36b..b32b60c 100644
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1675,7 +1675,7 @@ The default value is @samp{"The following message is a courtesy copy of
 an article\\nthat has been posted to %s as well.\\n\\n"}.
 
 @item message-fcc-externalize-attachments
-@vindex message-gcc-externalize-attachments
+@vindex message-fcc-externalize-attachments
 If @code{nil}, attach files as normal parts in Fcc copies; if it is
 non-@code{nil}, attach local files as external parts.