2001-06-12 11:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gnus-art.el (gnus-plain-save-name): Use file-relative-name.
	From Marc Lefranc <Marc.Lefranc@univ-lille1.fr>.

	* nnrss.el (nnrss-node-text): Node might be nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9495fa5..bf440e0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-12 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-art.el (gnus-plain-save-name): Use file-relative-name. 
+       From Marc Lefranc <Marc.Lefranc@univ-lille1.fr>.
+       
+       * nnrss.el (nnrss-node-text): Node might be nil.
+
 2001-06-11 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-uu.el (gnus-uu-save-article): Use mml tag instead of

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index bab3c7a..28dc570 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2758,7 +2758,9 @@ If variable `gnus-use-long-file-name' is non-nil, it is
       (expand-file-name
        (if (gnus-use-long-file-name 'not-save)
           newsgroup
-        (expand-file-name "news" (gnus-newsgroup-directory-form newsgroup)))
+        (file-relative-name
+         (expand-file-name "news" (gnus-newsgroup-directory-form newsgroup))
+         default-directory))
        gnus-article-save-directory)))
 
 (defun gnus-sender-save-name (newsgroup headers &optional last-file)

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 3df1fac..d6c1aa9 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -193,7 +193,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
                    "\t" ;; subject
                    (if (nth 4 e)
                        (nnrss-format-string (nth 4 e))
-                       "(nobody)")
+                     "(nobody)")
                    "\t" ;;from
                    (or (nth 5 e) "")
                    "\t" ;; date
@@ -564,8 +564,9 @@ It is useful when `(setq nnrss-use-local t)'."
   (nnweb-replace-in-string (nnrss-string-as-multibyte string) " *\n *" " "))
 
 (defun nnrss-node-text (node)
-  (if (stringp node) node
-    (mapconcat 'nnrss-node-text (cddr node) "")))
+  (if (and node (listp node))
+      (mapconcat 'nnrss-node-text (cddr node) "")
+    node))
 
 (provide 'nnrss)