Synch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 99af294..e05e25c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-07 23:46:22  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnweb.el (nnweb-insert): Stricter test.
+       * webmail.el (webmail-refresh-redirect): Ditto.
+
 2000-07-06 14:17:48  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-decode.el (mm-dissect-multipart): Match the EOL of boundary.

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index da85743..de3bb7f 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -761,7 +761,7 @@ If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
          (url-insert-file-contents url)
          (goto-char (point-min))
          (when (re-search-forward 
-                "HTTP-EQUIV=\"Refresh\"[^>]*URL=\\([^\"]+\\)\"" nil t)
+                "<meta[ \t\r\n]*http-equiv=\"Refresh\"[^>]*URL=\\([^\"]+\\)\"" nil t)
            (let ((url (match-string 1)))
              (delete-region (point-min) (point-max))
              (nnweb-insert url t))))

diff --git a/lisp/webmail.el b/lisp/webmail.el
index 2110624..5a845c5 100644 (file)
--- a/lisp/webmail.el
+++ b/lisp/webmail.el
@@ -314,7 +314,7 @@
   "Redirect refresh url in META."
   (goto-char (point-min))
   (while (re-search-forward 
-         "HTTP-EQUIV=\"Refresh\"[^>]*URL=\\([^\"]+\\)\""
+         "<meta[ \t\r\n]*http-equiv=\"Refresh\"[^>]*URL=\\([^\"]+\\)\""
          nil t)
     (let ((url (match-string 1)))
       (erase-buffer)

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 2eb2c84..6dff1e3 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -10660,7 +10660,10 @@ POP \e$B%5!<%P!<$NL>A0$G$9!#=i4|CM$O\e(B @code{MAILHOST} \e$B4D6-JQ?t$+$i<hF@$5$l$^
 \e$B$9!#\e(B
 
 @item :port
-POP \e$B%5!<%P!<$N%]!<%HHV9f$G$9!#=i4|CM$O\e(B @samp{pop3} \e$B$G$9!#\e(B
+POP \e$B%5!<%P!<$N%]!<%HHV9f$G$9!#$3$l$O?tCM\e(B (\e$BNc$($P\e(B @samp{:port 1234}) \e$B$+J8\e(B
+\e$B;zNs\e(B (\e$BNc$($P\e(B @samp{:port "pop3"}) \e$B$G$9!#$b$7J8;zNs$J$i\e(B Unix \e$B%7%9%F%`$K$*\e(B
+\e$B$1$k\e(B @file{/etc/services} \e$B$K:\$C$F$$$k%5!<%S%9L>$G$J$1$l$P$J$j$^$;$s!#=i\e(B
+\e$B4|CM$O\e(B @samp{pop3} \e$B$G$9!#\e(B
 
 @item :user
 POP \e$B%5!<%P!<$KM?$($kMxMQ<TL>$G$9!#=i4|CM$O%m%0%$%sL>$G$9!#\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 026e7e1..376d19b 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -11074,7 +11074,10 @@ The name of the POP server.  The default is taken from the
 @code{MAILHOST} environment variable.
 
 @item :port
-The port number of the POP server.  The default is @samp{pop3}.
+The port number of the POP server.  This can be a number (eg,
+@samp{:port 1234}) or a string (eg, @samp{:port "pop3"}).  If it is a
+string, it should be a service name as listed in @file{/etc/services} on
+Unix systems.  The default is @samp{"pop3"}.
 
 @item :user
 The user name to give to the POP server.  The default is the login