Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da43d57..9d3c475 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-24  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-agent.el (gnus-agent-request-article): Make sure it is not
+       empty file.
+
+       * nnweb.el (url): Ignore errors when request url.
+       
+       * nnrss.el: Clean up the comments.
+
 2002-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lpath.el: Fbind `w3m-region'; bind `w3m-mode-map'.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 364ac0a..6ee9ef1 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1891,8 +1891,9 @@ The following commands are available:
                  (gnus-agent-directory)
                  (gnus-agent-group-path group) "/"
                  (number-to-string article)))
-       (buffer-read-only nil))
-    (when (file-exists-p file)
+        (buffer-read-only nil))
+    (when (and (file-exists-p file)
+              (> (nth 7 (file-attributes file)) 0))
       (erase-buffer)
       (gnus-kill-all-overlays)
       (insert-file-contents-as-coding-system gnus-cache-coding-system file)

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 3196d54..126b3d0 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -1,5 +1,5 @@
 ;;; nnrss.el --- interfacing with RSS
-;; Copyright (C) 2001  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002  Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: RSS
@@ -39,7 +39,6 @@
 (eval-when-compile
   (ignore-errors
     (require 'xml)))
-;; Report failure to find w3 at load time if appropriate.
 (eval '(require 'xml))
 
 (nnoo-declare nnrss)

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 3ecbd27..44b25ac 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -1,5 +1,5 @@
 ;;; nnweb.el --- retrieving articles via web search engines
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -38,7 +38,9 @@
 (require 'nnmail)
 (require 'mm-util)
 (require 'mm-url)
-(require 'url)
+(eval-and-compile
+  (ignore-errors
+    (require 'url)))
 (autoload 'w3-parse-buffer "w3-parse")
 
 (nnoo-declare nnweb)