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

5 files changed, 13 insertions, 7 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0bdf47226ff..f4b77297867 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index abf99cbfd64..435acb1d6c2 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1047,7 +1047,7 @@ The following commands are available:
       (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 --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 77395ca5042..7dcef4b813b 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1534,7 +1534,7 @@ The source file has to be in the Emacs load path."
     ;; 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 --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 6c7c0436bc2..84de9c4e1ab 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -3233,21 +3233,21 @@ buffer that was in action when the last article was fetched."
           (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 --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 85f918986d5..bfaf1675703 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4400,7 +4400,7 @@ Otherwise, generate and save a value for `canlock-password' first."
    ;; 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? ")