(nnir-read-server-parm): Do not unconditionally fall back to global

variables if nnir-mail-backend is nil.
(nnir-retrieve-headers): Error when we cannot fill novitem.  It would
just result in a more obscure error later.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 02ec435..f8a76ea 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-10  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * nnir.el (nnir-read-server-parm): Do not unconditionally fall back to
+       global variables if nnir-mail-backend is nil.
+       (nnir-retrieve-headers): Error on void novitem.  It would just result
+       in a more obscure error later.
+
 2006-06-09  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
        * nnir.el (nnir-group-server): DTRT when called on native groups.  The

diff --git a/contrib/nnir.el b/contrib/nnir.el
index 3ee585b..640d958 100644 (file)
--- a/contrib/nnir.el
+++ b/contrib/nnir.el
@@ -836,8 +836,9 @@ and show thread that contains this article."
               (error
                "nnheader-parse-head returned nil for article %s in group %s"
                artno artfullgroup)))
-           (t (nnheader-report 'nnir "Don't support header type %s." foo))))
-       ;; replace article number in original group with article number
+           (t (error "Unknown header type %s while requesting article %s of group %s"
+                     foo artno artfullgroup))))
+       ;; replace article number in original group with article number
         ;; in nnir group
         (mail-header-set-number novitem art)
         (mail-header-set-from novitem
@@ -1507,8 +1508,6 @@ form 'backend:name'."
          ((and nnir-mail-backend
                (gnus-server-equal method nnir-mail-backend))
           (symbol-value key))
-         ((null nnir-mail-backend)
-          (symbol-value key))
          (t nil))))
 ;;     (if method
 ;;       (if (assq key (cddr method))