Synch to No Gnus 200511140435.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c634939..e7fa0e0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-13  Kevin Greiner  <kevin.greiner@compsol.cc>
+
+       * gnus-agent.el (gnus-agent-read-local): Trivial fix to format of
+       error message to display actual error condition.
+       (gnus-agent-save-local): Avoid saving symbols that are bound to
+       nil as they simply result in a warning message in
+       gnus-agent-read-local.
+
 2005-11-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-start.el (gnus-dribble-read-file): Use make-local-variable

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 3fefc37..31a5bbc 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -2180,7 +2180,7 @@ modified) original contents, they are first saved to their own file."
               ;; NOTE: The '+ 0' ensure that min and max are both numerics.
               (set group (cons (+ 0 min) (+ 0 max))))
           (error
-           (gnus-message 3 "Warning - invalid agent local: %s on line %d: "
+           (gnus-message 3 "Warning - invalid agent local: %s on line %d: %s"
                          file line (error-message-string err))))
         (forward-line 1)
         (setq line (1+ line))))
@@ -2211,13 +2211,14 @@ modified) original contents, they are first saved to their own file."
                                ((member (symbol-name symbol) '("+dirty" "+method"))
                                 nil)
                                (t
-                                (prin1 symbol)
                                 (let ((range (symbol-value symbol)))
-                                  (princ " ")
-                                  (princ (car range))
-                                  (princ " ")
-                                  (princ (cdr range))
-                                  (princ "\n")))))
+                                  (when range
+                                    (prin1 symbol)
+                                    (princ " ")
+                                    (princ (car range))
+                                    (princ " ")
+                                    (princ (cdr range))
+                                    (princ "\n"))))))
                        my-obarray))))))))
 
 (defun gnus-agent-get-local (group &optional gmane method)