From b6d02a2d461fd09a1b493768a92932a5696993ac Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 12 Mar 2002 12:51:36 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog     |    8 ++++++++
 lisp/nnslashdot.el |    2 +-
 lisp/pop3.el       |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1162b62..c617a52 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-12  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnslashdot.el (nnslashdot-request-article): Remove IFRAME.
+
+2002-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* pop3.el (pop3-open-server): Set process buffer unibyte.
+
 2002-03-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-fun.el (gnus-subscribe-to-mailing-list): New function.
diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index f507d66..5820103 100644
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -253,7 +253,7 @@
 			   (point)
 			   (progn
 			     (re-search-forward
-			      "<SCRIPT LANGUAGE=\"JAVASCRIPT\">\\|<!-- no ad 6 -->\\|&lt;&nbsp;[ \t\r\n]*<A HREF=\"\\(\\(http:\\)?//slashdot\\.org\\)?/article")
+			      "<IFRAME\\|<SCRIPT LANGUAGE=\"JAVASCRIPT\">\\|<!-- no ad 6 -->\\|&lt;&nbsp;[ \t\r\n]*<A HREF=\"\\(\\(http:\\)?//slashdot\\.org\\)?/article")
 			     (match-beginning 0)))))
 		(setq cid (cdr (assq article
 				     (nth 4 (assoc group nnslashdot-groups)))))
diff --git a/lisp/pop3.el b/lisp/pop3.el
index 826e6ed..8971aca 100644
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -188,7 +188,7 @@ Nil means no, t means yes, not-nil-or-t means yet to be determined.")
   "Open TCP connection to MAILHOST on PORT.
 Returns the process associated with the connection.
 Argument PORT specifies connecting port."
-  (let (process)
+  (let (default-enable-multibyte-characters process)
     (save-excursion
       (set-buffer (get-buffer-create (concat " trace of POP session to "
 					     mailhost)))
-- 
1.7.10.4