Synch with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index 59be7ad..15aacf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-11  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/lpath.el: Don't Fbind `xml-node-children'.
+
 2001-06-11  Akihiro Arisawa  <ari@atesoft.advantest.co.jp>
 
        * lisp/nnshimbun.el (nnshimbun-request-expire-articles): Fix

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50b4a1d..656579d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2001-06-11 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-uu.el (gnus-uu-save-article): Use mml tag instead of
+       part. From Katsumi Yamaoka <yamaoka@jpl.org>.
+       
+       * nnrss.el (nnrss-group-alist): More items.
+
+2001-06-09 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnrss.el (nnrss-node-text): Use cddr instead xml-node-children.
+
 2001-06-03  Dale Hagglund  <rdh@best.com>
        
        * gnus-mlspl.el (gnus-group-split-fancy): Fix generation of split

diff --git a/lisp/lpath.el b/lisp/lpath.el
index ae2cbb0..0b6960b 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -99,7 +99,7 @@
 (let ((functions-variables
        (cond
        ((featurep 'xemacs)
-        '((propertize xml-node-children xml-parse-region)))
+        '((propertize xml-parse-region)))
        ((>= emacs-major-version 21)
         '((function-max-args smiley-encode-buffer)))
        ((boundp 'MULE)
@@ -107,11 +107,11 @@
            coding-system-get compose-mail file-name-extension
            find-coding-systems-region function-max-args get-charset-property
            propertize shell-command-to-string smiley-encode-buffer
-           xml-node-children xml-parse-region)))
+           xml-parse-region)))
        (t
         '((function-max-args
            propertize smiley-encode-buffer
-           xml-node-children xml-parse-region))))))
+           xml-parse-region))))))
   (maybe-fbind (car functions-variables))
   (maybe-bind (car (cdr functions-variables))))
 

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 48a1180..3df1fac 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -149,8 +149,25 @@
     ;;("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.")
-    ("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.")))
+    ("[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" 
+     "http://www.heise.de/newsticker/heise.rdf" 
+     "German news ticker about technology.")
+    ("[de] Telepolis News" 
+     "http://www.heise.de/tp/news.rdf" 
+     "German background news about technology.")
+    ("Kuro5hin" 
+     "http://www.kuro5hin.org/backend.rdf"
+     "Technology and culture, from the trenches.")
+    ("JabberCentral"
+     "http://www.jabbercentral.com/rss.php"
+     "News around the Jabber instant messaging system.")))
 
 (defvar nnrss-use-local nil)
 
@@ -310,7 +327,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
 (defvar nnrss-extra-categories '(nnrss-snarf-moreover-categories))
 
 (defun nnrss-generate-active ()
-  (if (y-or-n-p "Fetch extra categories?")
+  (if (y-or-n-p "Fetch extra categories? ")
       (dolist (func nnrss-extra-categories)
        (funcall func)))
   (save-excursion
@@ -548,7 +565,7 @@ It is useful when `(setq nnrss-use-local t)'."
 
 (defun nnrss-node-text (node)
   (if (stringp node) node
-    (mapconcat 'nnrss-node-text (xml-node-children node) "")))
+    (mapconcat 'nnrss-node-text (cddr node) "")))
 
 (provide 'nnrss)
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index cb0cfe4..3221228 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-11 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus.texi: behaviour -> behavior. Suggested by Eli Zaretskii
+       <eliz@is.elta.co.il>.
+
 2001-06-09 20:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus.texi: Apply "overfull hbox" patch from Eli Zaretskii

diff --git a/texi/gnus.texi b/texi/gnus.texi
index d1a7e1d..c73a6b2 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9725,7 +9725,7 @@ then set the @code{gnus-post-method} to some other method:
 Now, if you've done this, and then this server rejects your article, or
 this server is down, what do you do then?  To override this variable you
 can use a non-zero prefix to the @kbd{C-c C-c} command to force using
-the ``current'' server, to get back the default behaviour, for posting.
+the ``current'' server, to get back the default behavior, for posting.
 
 If you give a zero prefix (i.e., @kbd{C-u 0 C-c C-c}) to that command,
 gnus will prompt you for what method to use for posting.