2001-04-29 08:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mail-source.el (mail-source-movemail): Call-process may return a
	signal description string.

	* gnus-start.el (gnus-read-newsrc-el-file):
	gnus-newsrc-file-version may be nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index baa8e4c..3337312 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2001-04-29 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * mail-source.el (mail-source-movemail): Call-process may return a
+       signal description string.
+
+       * gnus-start.el (gnus-read-newsrc-el-file):
+       gnus-newsrc-file-version may be nil.
+
        * nnmail.el (nnmail-get-new-mail): Use the exact file only.
        Suggested by Michael Sperber [Mr. Preprocessor]  
        <sperber@informatik.uni-tuebingen.de>.

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index e10d588..22e0096 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2077,7 +2077,9 @@ If FORCE is non-nil, the .newsrc file is read."
           (error "Error in %s" ding-file))))
       ;; Older versions of `gnus-format-specs' are no longer valid
       ;; in Oort Gnus 0.01.
-      (let ((version (gnus-continuum-version gnus-newsrc-file-version)))
+      (let ((version 
+            (and gnus-newsrc-file-version
+                 (gnus-continuum-version gnus-newsrc-file-version))))
        (when (or (not version)
                  (< version 5.090002))
          (setq gnus-format-specs nil)))

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 5c54fb6..618d02e 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -539,8 +539,9 @@ Pass INFO on to CALLBACK."
                  (goto-char (point-min))
                  (when (looking-at "movemail: ")
                    (delete-region (point-min) (match-end 0)))
+                 ;; Result may be a signal description string.
                  (unless (yes-or-no-p
-                          (format "movemail: %s (%d return).  Continue? "
+                          (format "movemail: %s (%s return).  Continue? "
                                   (buffer-string) result))
                    (error "%s" (buffer-string)))
                  (setq to nil)))))))