From: ueno <ueno>
Date: Sun, 23 May 2004 09:40:29 +0000 (+0000)
Subject: * riece-menu.el: Don't put 'riece-addon-default-disabled property.
X-Git-Tag: riece-1_0_0~15
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=acde163f0d49ab0d5ffbd1777d87b79cbe5036c3;p=elisp%2Friece.git

* riece-menu.el: Don't put 'riece-addon-default-disabled property.

* riece-log.el (riece-log-flashback): Don't check riece-log-enabled.

* riece.el (riece): Enable add-ons after startup.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c0a544..2c0a365 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2004-05-23  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-menu.el: Don't put 'riece-addon-default-disabled property.
+
+	* riece-log.el (riece-log-flashback): Don't check riece-log-enabled.
+
+	* riece.el (riece): Enable add-ons after startup.
+
+2004-05-23  Daiki Ueno  <ueno@unixuser.org>
+
 	* riece-unread.el (riece-unread-disable): Reset riece-unread-channels.
 
 2004-05-22  Daiki Ueno  <ueno@unixuser.org>
diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index 71923a4..744e367 100644
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -105,7 +105,7 @@ If integer, flash back only this line numbers. t means all lines."
       (expand-file-name name riece-log-directory))))
 
 (defun riece-log-flashback (identity)
-  (when (and riece-log-enabled riece-log-flashback)
+  (when riece-log-flashback
     (let ((file (riece-log-get-file identity)))
       (when (file-exists-p file)
 	(let (string)
diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 5f191f4..3e42c8e 100644
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -70,8 +70,6 @@
 (defconst riece-menu-description
   "Setup command menus on menubar")
 
-(put 'riece-menu 'riece-addon-default-disabled t)
-
 (defun riece-menu-create-layouts-menu (menu)
   (mapcar (lambda (entry)
 	    (vector (car entry) (list 'riece-command-change-layout (car entry))
@@ -109,8 +107,7 @@
 	      (easy-menu-define riece-menu
 				riece-command-mode-map
 				"Riece Menu"
-				riece-menu-items)
-	      (riece-enable-addon 'riece-menu))))
+				riece-menu-items))))
 
 (defvar riece-menu)
 (defun riece-menu-enable ()
diff --git a/lisp/riece.el b/lisp/riece.el
index 58ac0cf..aeaea19 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -275,8 +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)
-	  (unless (get (car pointer) 'riece-addon-default-disabled)
-	    (riece-enable-addon (car pointer) riece-debug))
 	  (setq pointer (cdr pointer))))
       (setq riece-addons-insinuated t))
     (if (or confirm (null riece-server))
@@ -305,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"))))