From 8aba3957f9f976d14525ee2e057203813d1579da Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 19 Feb 2003 05:50:27 +0000
Subject: [PATCH] Synch to Oort Gnus.

---
 lisp/ChangeLog    |    8 ++++++++
 lisp/gnus-util.el |    4 ++--
 lisp/message.el   |   20 +++++++++++++-------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a9537e..89f61c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-19  Jesper Harder  <harder@ifa.au.dk>
+
+	* message.el (message-fix-before-sending): Fix highlighting of
+	illegible and invisible text.
+
+	* gnus-util.el (gnus-multiple-choice): Separate choices with
+	",,A (B".  Suggested by Dan Jacobson <jidanni@dman.ddts.net>.
+
 2003-02-18  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus-sum.el (gnus-summary-exit-no-update): Use gnus-kill-buffer.
diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index cd82bed..b6d5740 100644
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1289,10 +1289,10 @@ CHOICE is a list of the choice char and help message at IDX."
     (save-window-excursion
       (save-excursion
 	(while (not tchar)
-	  (message "%s (%s?): "
+	  (message "%s (%s): "
 		   prompt
 		   (mapconcat (lambda (s) (char-to-string (car s)))
-			      choice ""))
+			      choice ", "))
 	  (setq tchar (read-char))
 	  (when (not (assq tchar choice))
 	    (setq tchar nil)
diff --git a/lisp/message.el b/lisp/message.el
index d33986c..7f43ebb 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3695,13 +3695,17 @@ used to distinguish whether the invisible text is a MIME part or not."
 						  'mime-edit-invisible t))
 	  (when (> mime-from mime-to)
 	    (setq hidden-start (or hidden-start mime-to))
-	    (put-text-property mime-to mime-from 'invisible nil))
+	    (add-text-properties mime-to mime-from
+				 '(invisible nil face highlight
+					     font-lock-face highlight)))
 	  (setq mime-to (or (text-property-not-all mime-from to
 						   'mime-edit-invisible t)
 			    to)))
 	(when (< mime-to to)
 	  (setq hidden-start (or hidden-start mime-to))
-	  (put-text-property mime-to to 'invisible nil)))
+	  (add-text-properties mime-to to
+			       '(invisible nil face highlight
+					   font-lock-face highlight))))
       (when hidden-start
 	(goto-char hidden-start)
 	(set-window-start (selected-window) (gnus-point-at-bol))
@@ -3720,14 +3724,15 @@ 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)))))
-	  (add-text-properties (point) (1+ (point)) '(highlight t))
+	  (add-text-properties (point) (1+ (point))
+			       '(font-lock-face highlight face highlight))
 	  (setq found t))
 	(forward-char)
 	(skip-chars-forward mm-7bit-chars))
       (when found
 	(setq choice
 	      (gnus-multiple-choice
-	       "Illegible text found. Continue posting? "
+	       "Illegible text found.  Continue posting?"
 	       '((?d "Remove and continue posting")
 		 (?r "Replace with dots and continue posting")
 		 (?i "Ignore and continue posting")
@@ -3744,10 +3749,11 @@ used to distinguish whether the invisible text is a MIME part or not."
 				 '(eight-bit-control eight-bit-graphic
 						     control-1)))))
 	    (if (eq choice ?i)
-		(remove-text-properties (point) (1+ (point)) '(highlight t))
+		(remove-text-properties (point) (1+ (point))
+					'(font-lock-face highlight face highlight))
 	      (delete-char 1)
-	      (if (eq choice ?r)
-		  (insert "."))))
+	      (when (eq choice ?r)
+		(insert "."))))
 	  (forward-char)
 	  (skip-chars-forward mm-7bit-chars))))))
 
-- 
1.7.10.4