From 360442d51d236971d8d777ea43d05b1c7d7ea975 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Mon, 10 Jul 2000 22:25:31 +0000
Subject: [PATCH] Synch.

---
 lisp/ChangeLog       |   11 +++++++++++
 lisp/gnus-mailcap.el |    2 +-
 lisp/nnslashdot.el   |   33 ++++++++++++++++++---------------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e05e25c..1c44cd5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2000-07-10 11:43:22  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnslashdot.el (nnslashdot-threaded-retrieve-headers): Use
+	unibyte.
+	(nnslashdot-sane-retrieve-headers): Ditto.
+	(nnslashdot-request-article): Ditto.
+
+2000-07-10 11:12:32  William M. Perry <wmperry@aventail.com>
+
+	* mailcap.el (mailcap-parse-mimetype-file): 
+
 2000-07-07 23:46:22  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* nnweb.el (nnweb-insert): Stricter test.
diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el
index a72730a..41f898a 100644
--- a/lisp/gnus-mailcap.el
+++ b/lisp/gnus-mailcap.el
@@ -881,7 +881,7 @@ environment variable MIMETYPES if set; otherwise use a default path."
       (while (not (eobp))
 	(skip-chars-forward " \t\n")
 	(setq save-pos (point))
-	(skip-chars-forward "^ \t")
+	(skip-chars-forward "^ \t\n")
 	(downcase-region save-pos (point))
 	(setq type (buffer-substring save-pos (point)))
 	(while (not (eolp))
diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 0aca640..6de3f50 100644
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -195,8 +195,9 @@
     (save-excursion
       (set-buffer nntp-server-buffer)
       (erase-buffer)
-      (dolist (header nnslashdot-headers)
-	(nnheader-insert-nov (cdr header))))
+      (mm-with-unibyte-current-buffer
+       (dolist (header nnslashdot-headers)
+	 (nnheader-insert-nov (cdr header)))))
     'nov))
 
 (deffoo nnslashdot-sane-retrieve-headers (articles group)
@@ -292,8 +293,9 @@
     (save-excursion
       (set-buffer nntp-server-buffer)
       (erase-buffer)
-      (dolist (header nnslashdot-headers)
-	(nnheader-insert-nov (cdr header))))
+      (mm-with-unibyte-current-buffer
+	(dolist (header nnslashdot-headers)
+	  (nnheader-insert-nov (cdr header)))))
     'nov))
 
 (deffoo nnslashdot-request-group (group &optional server dont-check)
@@ -350,17 +352,18 @@
       (save-excursion
 	(set-buffer (or buffer nntp-server-buffer))
 	(erase-buffer)
-	(insert contents)
-	(goto-char (point-min))
-	(while (re-search-forward "\\(<br>\r?\\)+" nil t)
-	  (replace-match "<p>" t t))
-	(goto-char (point-min))
-	(insert "Content-Type: text/html\nMIME-Version: 1.0\n")
-	(insert "Newsgroups: " (caddr (assoc group nnslashdot-groups))
-		"\n")
-	(let ((header (cdr (assq article nnslashdot-headers))))
-	  (nnheader-insert-header header))
-	(nnheader-report 'nnslashdot "Fetched article %s" article)
+	(mm-with-unibyte-current-buffer
+	  (insert contents)
+	  (goto-char (point-min))
+	  (while (re-search-forward "\\(<br>\r?\\)+" nil t)
+	    (replace-match "<p>" t t))
+	  (goto-char (point-min))
+	  (insert "Content-Type: text/html\nMIME-Version: 1.0\n")
+	  (insert "Newsgroups: " (caddr (assoc group nnslashdot-groups))
+		  "\n")
+	  (let ((header (cdr (assq article nnslashdot-headers))))
+	    (nnheader-insert-header header))
+	  (nnheader-report 'nnslashdot "Fetched article %s" article))
 	(cons group article)))))
 
 (deffoo nnslashdot-close-server (&optional server)
-- 
1.7.10.4