Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7deed3a..5b602b1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): New param.
+       (gnus-summary-line-format-alist): Fix param.
+
 2001-10-02  Simon Josefsson  <jas@extundo.com>
 
        * nnimap.el (nnimap-request-move-article): Use imap.el directly,

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index ddeeaa4..2441e5b 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1120,7 +1120,8 @@ that were fetched.  Say, for nnultimate groups."
     (?l (bbb-grouplens-score gnus-tmp-header) ?s)
     (?V (gnus-thread-total-score (and (boundp 'thread) (car thread))) ?d)
     (?U gnus-tmp-unread ?c)
-    (?f (gnus-summary-from-or-to-or-newsgroups gnus-tmp-header) ?s)
+    (?f (gnus-summary-from-or-to-or-newsgroups gnus-tmp-header gnus-tmp-from)
+       ?s)
     (?t (gnus-summary-number-of-articles-in-thread
         (and (boundp 'thread) (car thread)) gnus-tmp-level)
        ?d)
@@ -2915,9 +2916,7 @@ buffer that was in action when the last article was fetched."
   (or (car (funcall gnus-extract-address-components from))
       from))
 
-(eval-when-compile (defvar gnus-tmp-from))
-
-(defun gnus-summary-from-or-to-or-newsgroups (header)
+(defun gnus-summary-from-or-to-or-newsgroups (header gnus-tmp-from)
   (let ((default-mime-charset (with-current-buffer gnus-summary-buffer
                                default-mime-charset)))
     ;; Is it really necessary to do this next part for each summary line?

diff --git a/texi/ChangeLog b/texi/ChangeLog
index d9999fe..3f4c5f7 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-03 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * emacs-mime.texi (mailcap): rvplayer -> wavplayer.
+
 2001-09-29  Simon Josefsson  <jas@extundo.com>
 
        * gnus.texi (Foreign Groups): Fix.  Add "mailman".

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 778229c..d2bed12 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -785,7 +785,7 @@ audio/wav; wavplayer %s
 @end example
 
 This says that all image files should be displayed with @code{gimp}, and
-that realaudio files should be played by @code{rvplayer}.
+that WAVE audio files should be played by @code{wavplayer}.
 
 The @code{mailcap} library parses this file, and provides functions for
 matching types.