*** empty log message ***

[gnus] / lisp / nnoo.el

diff --git a/lisp/nnoo.el b/lisp/nnoo.el
index 9412ba0..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
@@ -39,7 +39,6 @@
          `(defvar ,var ,init))
      (nnoo-define ',var ',map)))
 (put 'defvoo 'lisp-indent-function 2)
-(put 'defvoo 'lisp-indent-hook 2)
 (put 'defvoo 'edebug-form-spec '(var init &optional doc &rest map))
 
 (defmacro deffoo (func args &rest forms)
@@ -48,7 +47,6 @@
        (defun ,func ,args ,@forms)
      (nnoo-register-function ',func)))
 (put 'deffoo 'lisp-indent-function 2)
-(put 'deffoo 'lisp-indent-hook 2)
 (put 'deffoo 'edebug-form-spec '(&define name lambda-list def-body))
 
 (defun nnoo-register-function (func)
@@ -60,12 +58,13 @@
 
 (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)
-(put 'nnoo-declare 'lisp-indent-hook 1)
 
 (defun nnoo-parents (backend)
   (nth 1 (assoc backend nnoo-definition-alist)))
@@ -79,7 +78,6 @@
 (defmacro nnoo-import (backend &rest imports)
   `(nnoo-import-1 ',backend ',imports))
 (put 'nnoo-import 'lisp-indent-function 1)
-(put 'nnoo-import 'lisp-indent-hook 1)
 
 (defun nnoo-import-1 (backend imports)
   (let ((call-function
@@ -113,7 +111,6 @@
 (defmacro nnoo-map-functions (backend &rest maps)
   `(nnoo-map-functions-1 ',backend ',maps))
 (put 'nnoo-map-functions 'lisp-indent-function 1)
-(put 'nnoo-map-functions 'lisp-indent-hook 1)
 
 (defun nnoo-map-functions-1 (backend maps)
   (let (m margs i)
@@ -129,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)))))
@@ -160,7 +157,8 @@
   (let* ((bstate (cdr (assq backend nnoo-state-alist)))
         (current (car bstate))
         (parents (nnoo-parents backend))
-        state)
+        (bvariables (nnoo-variables backend))
+        state def)
     (unless bstate
       (push (setq bstate (list backend nil))
            nnoo-state-alist)
@@ -175,12 +173,15 @@
        (pop state))
       (setcar bstate server)
       (unless (cdr (assoc server (cddr bstate)))
-       (while defs
-         (set (caar defs) (cadar defs))
-         (pop defs)))
+       (while (setq def (pop defs))
+         (unless (assq (car def) bvariables)
+           (nconc bvariables
+                  (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))))
@@ -191,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)))
@@ -256,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))