Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b5f481..baedd82 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-26 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnrss.el (nnrss-retrieve-headers): The description may exist.
+       Suggested by Christoph Conrad <C.Conrad@cli.de>.
+
+       * gnus-sum.el (gnus-summary-set-local-parameters): Don't override
+       group variables.
+
 2001-06-25 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nnslashdot.el (nnslashdot-write-groups): Use gnus-prin1.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 8467b58..7075670 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -3002,6 +3002,7 @@ the thread are to be displayed."
 (defun gnus-summary-set-local-parameters (group)
   "Go through the local params of GROUP and set all variable specs in that list."
   (let ((params (gnus-group-find-parameter group))
+        (vars '(quit-config)) ; Ignore quit-config.
        elem)
     (while params
       (setq elem (car params)
@@ -3009,8 +3010,9 @@ the thread are to be displayed."
       (and (consp elem)                        ; Has to be a cons.
           (consp (cdr elem))           ; The cdr has to be a list.
           (symbolp (car elem))         ; Has to be a symbol in there.
-          (not (memq (car elem) '(quit-config))) ; Ignore quit-config.
+           (not (memq (car elem) vars))
           (ignore-errors               ; So we set it.
+             (push (car elem) vars)
             (make-local-variable (car elem))
             (set (car elem) (eval (nth 1 elem))))))))
 

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index ce41298..13d3527 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -203,10 +203,13 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
                    "0" "\t" ;; chars
                    "0" "\t" ;; lines
                    "" "\t" ;; Xref
-                   (if (memq nnrss-description-field nnmail-extra-headers)
+                   (if (and (nth 6 e)
+                             (memq nnrss-description-field 
+                                   nnmail-extra-headers))
                        (concat (symbol-name nnrss-description-field)
                                ": "
-                               (nnrss-format-string (nth 6 e)) "\t")
+                                (nnrss-format-string (nth 6 e))
+                                "\t")
                      "")
                    "\n")))))
   'nov)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 0d2dda9..ca8c3ae 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-27  Simon Josefsson  <jas@extundo.com>
+       From Ralph Schleicher <rs@nunatak.allgaeu.org>
+
+       * gnus.texi (MIME Commands): Add.
+
 2001-06-24  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus.texi (Summary Score Commands): Say that some commands

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 5202a17..c9bee35 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -8068,6 +8068,42 @@ Here's an example function the does the latter:
 @item gnus-mime-multipart-functions
 Alist of @sc{mime} multipart types and functions to handle them.
 
+@vindex mm-file-name-rewrite-functions
+@item mm-file-name-rewrite-functions
+List of functions used for rewriting file names of @sc{mime} parts.
+Each function takes a file name as input and returns a file name.
+
+Ready-made functions include@*
+@code{mm-file-name-delete-whitespace},
+@code{mm-file-name-trim-whitespace},
+@code{mm-file-name-collapse-whitespace}, and
+@code{mm-file-name-replace-whitespace}.  The later uses the value of
+the variable @code{mm-file-name-replace-whitespace} to replace each
+whitespace character in a file name with that string; default value
+is @code{"_"} (a single underscore).
+@findex mm-file-name-delete-whitespace
+@findex mm-file-name-trim-whitespace
+@findex mm-file-name-collapse-whitespace
+@findex mm-file-name-replace-whitespace
+@vindex mm-file-name-replace-whitespace
+
+The standard functions @code{capitalize}, @code{downcase},
+@code{upcase}, and @code{upcase-initials} may be useful, too.
+
+Everybody knows that whitespace characters in file names are evil,
+except those who don't know.  If you receive lots of attachments from
+such unenlightened users, you can make live easier by adding
+
+@lisp
+(setq mm-file-name-rewrite-functions
+      '(mm-file-name-trim-whitespace
+        mm-file-name-collapse-whitespace
+        mm-file-name-replace-whitespace))
+@end lisp
+
+@noindent
+to your @file{.gnus} file.
+
 @end table