X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece.el;h=da4adab50e4959df4f78885fa405eac16dada8e6;hb=fe7eeb17a3b1cc9b6a5316aebae340cba1ede06d;hp=9bf039b0ff894145ce67b36758b8c70b1afca4c0;hpb=cb89240653b5a921c8d1e71edf1855c07279d960;p=riece

diff --git a/lisp/riece.el b/lisp/riece.el
index 9bf039b..da4adab 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -305,7 +305,8 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
 	(setq server-list (cdr server-list))))
     (let ((pointer riece-addons))
       (while pointer
-	(riece-enable-addon (car pointer) riece-debug)
+	(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
@@ -384,7 +385,7 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
      "^[]{}'`"))
 
   (run-hooks 'riece-command-mode-hook))
-  
+
 (defun riece-dialogue-mode ()
   "Major mode for displaying the IRC dialogue.
 All normal editing commands are turned off.
@@ -440,7 +441,7 @@ All normal editing commands are turned off."
   (kill-all-local-variables)
   (buffer-disable-undo)
   (setq major-mode 'riece-channel-list-mode
-        mode-name "Channels"
+	mode-name "Channels"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification '("Riece: "))
 	truncate-lines t
@@ -459,7 +460,7 @@ Instead, these commands are available:
   (kill-all-local-variables)
   (buffer-disable-undo)
   (setq major-mode 'riece-user-list-mode
-        mode-name "Users"
+	mode-name "Users"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification
 	 '("Riece: " riece-long-channel-indicator " "))
@@ -484,7 +485,7 @@ Instead, these commands are available:
 		    (eq major-mode (nth 2 (car alist))))
 	  (funcall (nth 2 (car alist))))
 	(setq alist (cdr alist))))))
-      
+
 (provide 'riece)
 
 ;;; riece.el ends here