Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index edaa449..02307dc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-05-08  Dave Love  <fx@gnu.org>
+
+       * pop3.el (pop3-open-server): Fix creating name of trace buffer.
+
+2000-05-08 01:07:47  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-decode.el (mm-interactively-view-part): Append %s if the
+       method is a single word.
+       * nnwarchive.el (nnwarchive-type-definition): Typo.
+
 2000-05-07 17:24:01  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-group.el (gnus-group-prepare-flat-list-dead-predicate): New

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 564334a..3c9820b 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -708,6 +708,8 @@ external if displayed external."
         (method (completing-read "Viewer: " methods)))
     (when (string= method "")
       (error "No method given"))
+    (if (string-match "^[^% \t]+$" method) 
+       (setq method (concat method " %s")))
     (mm-display-external (copy-sequence handle) method)))
 
 (defun mm-preferred-alternative (handles &optional preferred)

diff --git a/lisp/nnwarchive.el b/lisp/nnwarchive.el
index f888a62..5103b55 100644 (file)
--- a/lisp/nnwarchive.el
+++ b/lisp/nnwarchive.el
@@ -68,9 +68,9 @@
      (list-dissect . nnwarchive-egroups-list)
      (list-groups . nnwarchive-egroups-list-groups)
      (xover-url 
-      "http://www.egroups.com/message/%s/%d" group aux)
+      "http://www.egroups.com/messages/%s/%d" group aux)
      (xover-last-url 
-      "http://www.egroups.com/message/%s/" group)
+      "http://www.egroups.com/messages/%s/" group)
      (xover-page-size . 13)
      (xover-dissect . nnwarchive-egroups-xover)
      (article-url 

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 0c45144..dabe4ee 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -165,7 +165,7 @@ Returns the process associated with the connection.
 Argument PORT specifies connecting port."
   (let (process)
     (save-excursion
-      (set-buffer (get-buffer-create (concat " trace of POP session to %s"
+      (set-buffer (get-buffer-create (concat " trace of POP session to "
                                             mailhost)))
       (erase-buffer)
       (setq pop3-read-point (point-min))