*** empty log message ***

[gnus] / lisp / nnoo.el

diff --git a/lisp/nnoo.el b/lisp/nnoo.el
index 210e42e..254aea4 100644 (file)
--- a/lisp/nnoo.el
+++ b/lisp/nnoo.el
@@ -1,5 +1,5 @@
 ;;; nnoo.el --- OO Gnus Backends
-;; Copyright (C) 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1996,97 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news
@@ -58,10 +58,12 @@
 
 (defmacro nnoo-declare (backend &rest parents)
   `(eval-and-compile
-     (push (list ',backend 
+     (push (list ',backend
                 (mapcar (lambda (p) (list p)) ',parents)
                 nil nil)
-          nnoo-definition-alist)))
+          nnoo-definition-alist)
+     (push (list ',backend "*internal-non-initialized-backend*")
+          nnoo-state-alist)))
 (put 'nnoo-declare 'lisp-indent-function 1)
 
 (defun nnoo-parents (backend)
@@ -124,7 +126,7 @@
                 (&rest args)
               (nnoo-parent-function ',backend ',(car m)
                                     ,(cons 'list (nreverse margs))))))))
-  
+
 (defun nnoo-backend (symbol)
   (string-match "^[^-]+-" (symbol-name symbol))
   (intern (substring (symbol-name symbol) 0 (1- (match-end 0)))))
@@ -174,14 +176,12 @@
        (while (setq def (pop defs))
          (unless (assq (car def) bvariables)
            (nconc bvariables
-                  (list (cons (car def)
-                              (condition-case ()
-                                  (symbol-value (car def))
-                                (error nil))))))
+                  (list (cons (car def) (and (boundp (car def))
+                                             (symbol-value (car def)))))))
          (set (car def) (cadr def))))
       (while parents
-       (nnoo-change-server 
-        (caar parents) server 
+       (nnoo-change-server
+        (caar parents) server
         (mapcar (lambda (def) (list (car def) (symbol-value (cadr def))))
                 (cdar parents)))
        (pop parents))))
@@ -192,6 +192,14 @@
        (defs (nnoo-variables backend)))
     ;; Remove the old definition.
     (setcdr (cdr bstate) (delq (assoc current (cddr bstate)) (cddr bstate)))
+    ;; If this is the first time we push the server (i. e., this is
+    ;; the nil server), then we update the default values of
+    ;; all the variables to reflect the current values.
+    (when (equal current "*internal-non-initialized-backend*")
+      (let ((defaults (nnoo-variables backend))
+           def)
+       (while (setq def (pop defaults))
+         (setcdr def (symbol-value (car def))))))
     (let (state)
       (while defs
        (push (cons (caar defs) (symbol-value (caar defs)))
@@ -257,7 +265,7 @@ All functions will return nil and report an error."
 (defun nnoo-define-skeleton-1 (backend)
   (let ((functions '(retrieve-headers
                     request-close request-article
-                    open-group request-group close-group
+                    request-group close-group
                     request-list request-post request-list-newsgroups))
        function fun)
     (while (setq function (pop functions))