Synch to No Gnus 200602130716.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30cc454..59080a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nnoo.el (nnoo-declare): Don't generate duplicate entries when
+       re-loading nn* modules.
+
 2006-02-10  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-group.el (gnus-group-make-tool-bar): Remove duplicate check

diff --git a/lisp/nnoo.el b/lisp/nnoo.el
index bdc30cb..86de41c 100644 (file)
--- a/lisp/nnoo.el
+++ b/lisp/nnoo.el
@@ -61,12 +61,16 @@
 
 (defmacro nnoo-declare (backend &rest parents)
   `(eval-and-compile
-     (push (list ',backend
-                (mapcar (lambda (p) (list p)) ',parents)
-                nil nil)
-          nnoo-definition-alist)
-     (push (list ',backend "*internal-non-initialized-backend*")
-          nnoo-state-alist)))
+     (if (assq ',backend nnoo-definition-alist)
+        (setcar (cdr (assq ',backend nnoo-definition-alist))
+                (mapcar 'list ',parents))
+       (push (list ',backend
+                  (mapcar 'list ',parents)
+                  nil nil)
+            nnoo-definition-alist))
+     (unless (assq ',backend nnoo-state-alist)
+       (push (list ',backend "*internal-non-initialized-backend*")
+            nnoo-state-alist))))
 (put 'nnoo-declare 'lisp-indent-function 1)
 
 (defun nnoo-parents (backend)