# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1097128421 0
# Node ID ef5d2ed6459e8d18fc97d74f8024d1303c83dc69
# Parent  9279048e751ae5424ce8e4d6de2ea162ae44cecc
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-603

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-44
   Update from CVS

diff -r 9279048e751a -r ef5d2ed6459e lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Oct 06 21:30:45 2004 +0000
+++ b/lisp/gnus/ChangeLog	Thu Oct 07 05:53:41 2004 +0000
@@ -1,5 +1,11 @@
 2004-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* gnus-group.el (gnus-update-group-mark-positions):
+	* gnus-sum.el (gnus-update-summary-mark-positions):
+	* message.el (message-check-news-body-syntax):
+	* gnus-msg.el (gnus-debug): Use mm-string-as-multibyte instead
+	of string-as-multibyte.
+
 	* gnus-sum.el (gnus-summary-insert-subject): Remove redundant setq.
 
 2004-10-05  Juri Linkov  <juri@jurta.org>
diff -r 9279048e751a -r ef5d2ed6459e lisp/gnus/gnus-group.el
--- a/lisp/gnus/gnus-group.el	Wed Oct 06 21:30:45 2004 +0000
+++ b/lisp/gnus/gnus-group.el	Thu Oct 07 05:53:41 2004 +0000
@@ -1047,7 +1047,7 @@
       (goto-char (point-min))
       (setq gnus-group-mark-positions
 	    (list (cons 'process (and (search-forward
-				       (string-as-multibyte "\200") nil t)
+				       (mm-string-as-multibyte "\200") nil t)
 				      (- (point) 2))))))))
 
 (defun gnus-mouse-pick-group (e)
diff -r 9279048e751a -r ef5d2ed6459e lisp/gnus/gnus-msg.el
--- a/lisp/gnus/gnus-msg.el	Wed Oct 06 21:30:45 2004 +0000
+++ b/lisp/gnus/gnus-msg.el	Thu Oct 07 05:53:41 2004 +0000
@@ -1534,7 +1534,7 @@
     ;; Remove any control chars - they seem to cause trouble for some
     ;; mailers.  (Byte-compiled output from the stuff above.)
     (goto-char point)
-    (while (re-search-forward (string-as-multibyte
+    (while (re-search-forward (mm-string-as-multibyte
 			       "[\000-\010\013-\037\200-\237]") nil t)
       (replace-match (format "\\%03o" (string-to-char (match-string 0)))
 		     t t))))
diff -r 9279048e751a -r ef5d2ed6459e lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Wed Oct 06 21:30:45 2004 +0000
+++ b/lisp/gnus/gnus-sum.el	Thu Oct 07 05:53:41 2004 +0000
@@ -3233,21 +3233,21 @@
 	  (goto-char (point-min))
 	  (setq pos (list (cons 'unread
 				(and (search-forward
-				      (string-as-multibyte "\200") nil t)
+				      (mm-string-as-multibyte "\200") nil t)
 				     (- (point) (point-min) 1)))))
 	  (goto-char (point-min))
 	  (push (cons 'replied (and (search-forward
-				     (string-as-multibyte "\201") nil t)
+				     (mm-string-as-multibyte "\201") nil t)
 				    (- (point) (point-min) 1)))
 		pos)
 	  (goto-char (point-min))
 	  (push (cons 'score (and (search-forward
-				   (string-as-multibyte "\202") nil t)
+				   (mm-string-as-multibyte "\202") nil t)
 				  (- (point) (point-min) 1)))
 		pos)
 	  (goto-char (point-min))
 	  (push (cons 'download (and (search-forward
-				      (string-as-multibyte "\203") nil t)
+				      (mm-string-as-multibyte "\203") nil t)
 				     (- (point) (point-min) 1)))
 		pos)))
       (setq gnus-summary-mark-positions pos))))
diff -r 9279048e751a -r ef5d2ed6459e lisp/gnus/message.el
--- a/lisp/gnus/message.el	Wed Oct 06 21:30:45 2004 +0000
+++ b/lisp/gnus/message.el	Thu Oct 07 05:53:41 2004 +0000
@@ -4400,7 +4400,7 @@
    ;; Check for control characters.
    (message-check 'control-chars
      (if (re-search-forward
-	  (string-as-multibyte "[\000-\007\013\015-\032\034-\037\200-\237]")
+	  (mm-string-as-multibyte "[\000-\007\013\015-\032\034-\037\200-\237]")
 	  nil t)
 	 (y-or-n-p
 	  "The article contains control characters.  Really post? ")