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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5c5d02..ee69de1 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 4097f2e..1e68cad 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2996,6 +2996,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)
@@ -3003,8 +3004,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)