From: yamaoka <yamaoka>
Date: Tue, 12 Jun 2001 23:10:51 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_4-02-quimby~7
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28940d31ed720e8f07b19dc2bf4d57bd5125d0df;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 656579d..2f8587b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2001-06-12 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* message.el (message-options-set-recipient): Don't add ", "
+	unless necessary. Suggested by Josh Huber <huber@alum.wpi.edu>.
+
+2001-06-12 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnrss.el (nnrss-group-alist): Use |fr| instead of [fr].
+
+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 bc784f7..03d1232 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2955,7 +2955,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/message.el b/lisp/message.el
index 0cce8e0..a2d247f 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5898,11 +5898,16 @@ regexp varstr."
 			 (mail-strip-quoted-names
 			  (message-fetch-field "from")))
     (message-options-set 'message-recipients
-			 (mail-strip-quoted-names
-			  (concat
-			   (or (message-fetch-field "to") "") ", "
-			   (or (message-fetch-field "cc") "") ", "
-			   (or (message-fetch-field "bcc") ""))))))
+ 			 (mail-strip-quoted-names
+			  (let ((to (message-fetch-field "to"))
+				(cc (message-fetch-field "cc"))
+				(bcc (message-fetch-field "bcc")))
+			    (concat
+			     (or to "")
+			     (if (and to cc) ", ")
+			     (or cc "")
+			     (if (and (or to cc) bcc) ", ")
+			     (or bcc "")))))))
 
 (when (featurep 'xemacs)
   (require 'messagexmas)
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 3df1fac..6079d34 100644
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -149,17 +149,17 @@
     ;;("TNL.net newsletter" "http://www.tnl.net/newsletter/channel100.asp" "A newsletter about Internet technology and issues.")
     ("W3C" "http://www.w3.org/2000/08/w3c-synd/home.rss" "The latest news at the World Wide Web Consortium.")
     ;;("XML News: RSS Live Content" "http://www.xmlnews.org/RSS/content.html" "A listing of well-known RSS feeds.")
-    ("[fr] XMLfr" "http://xmlfr.org/actualites/general.rss10" 
+    ("|fr| XMLfr" "http://xmlfr.org/actualites/general.rss10" 
      "French speaking portal site dedicated to XML.")
     ("XMLhack" "http://xmlhack.com/rss10.php" 
      "Developer news from the XML community.")
     ("The Register" 
      "http://www.theregister.co.uk/tonys/slashdot.rdf" 
      "The Register -- Biting the hand that feeds IT.")
-    ("[de] Heise-Ticker" 
+    ("|de| Heise-Ticker" 
      "http://www.heise.de/newsticker/heise.rdf" 
      "German news ticker about technology.")
-    ("[de] Telepolis News" 
+    ("|de| Telepolis News" 
      "http://www.heise.de/tp/news.rdf" 
      "German background news about technology.")
     ("Kuro5hin" 
@@ -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)