* riece.el (riece-exit): Don't disable addons.

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index d096215..43239ae 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -155,6 +155,7 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "/" riece-command-raw
     ">" end-of-buffer
     "<" beginning-of-buffer
+    "^" riece-command-list-addons
     "\C-ta" riece-command-toggle-away
     "c" riece-command-select-command-buffer
     "f" riece-command-finger
@@ -274,7 +275,6 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
       (let ((pointer riece-addons))
        (while pointer
          (riece-insinuate-addon (car pointer) riece-debug)
-         (riece-enable-addon (car pointer) riece-debug)
          (setq pointer (cdr pointer))))
       (setq riece-addons-insinuated t))
     (if (or confirm (null riece-server))
@@ -303,6 +303,11 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
       (while server-list
        (riece-command-open-server (car server-list))
        (setq server-list (cdr server-list))))
+    (let ((pointer riece-addons))
+      (while pointer
+       (unless (get (car pointer) 'riece-addon-default-disabled)
+         (riece-enable-addon (car pointer) riece-debug))
+       (setq pointer (cdr pointer))))
     (run-hooks 'riece-startup-hook)
     (message "%s" (substitute-command-keys
                   "Type \\[describe-mode] for help"))))