* riece-options.el (riece-addons): Add riece-button.

[riece] / lisp / riece-options.el

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index cafcc4d..0872933 100644 (file)
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -68,11 +68,6 @@
   :type '(repeat integer)
   :group 'riece-looks)
 
-(defcustom riece-inhibit-startup-message nil
-  "If non-nil, the startup message will not be displayed."
-  :group 'riece-looks
-  :type 'boolean)
-
 (defcustom riece-directory "~/.riece"
   "Where to look for data files."
   :type 'directory
@@ -105,7 +100,13 @@ way is to put Riece variables on .emacs or file loaded from there."
   :type '(repeat (file :tag "Initialization File"))
   :group 'riece-options)
 
-(defcustom riece-addons '(riece-highlight riece-ctcp)
+(defcustom riece-addons '(riece-highlight
+                         riece-ctcp
+                         riece-guess
+                         riece-unread
+                         riece-history
+                         riece-url
+                         riece-button)
   "Add-ons insinuated into Riece."
   :type '(repeat symbol)
   :group 'riece-options)
@@ -184,7 +185,8 @@ way is to put Riece variables on .emacs or file loaded from there."
 
 (defcustom riece-startup-channel-list nil
   "A list of channels to join automatically at startup."
-  :type '(repeat (string :tag "Startup Channel"))
+  :type '(repeat (choice (string :tag "Channel")
+                        (list (string :tag "Channel") (string :tag "Key"))))
   :group 'riece-channel)
 
 (defcustom riece-retry-with-new-nickname nil
@@ -192,6 +194,11 @@ way is to put Riece variables on .emacs or file loaded from there."
   :type 'boolean
   :group 'riece-server)
 
+(defcustom riece-quit-timeout 10
+  "Quit timeout when there is no response from server."
+  :type 'integer
+  :group 'riece-server)
+
 (defcustom riece-channel-buffer-mode t
   "When non-nil, Riece will display a channel buffer."
   :type 'boolean
@@ -208,12 +215,7 @@ way is to put Riece variables on .emacs or file loaded from there."
   :group 'riece-looks)
 
 (defcustom riece-default-freeze nil
-  "If non nil, channel buffer local freeze flag is on at starting."
-  :type 'boolean
-  :group 'riece-looks)
-
-(defcustom riece-default-own-freeze nil
-  "If non nil, channel buffer local own freeze flag is on at starting."
+  "Channel buffer local freeze flag is on at starting."
   :type 'boolean
   :group 'riece-looks)
 
@@ -229,8 +231,13 @@ way is to put Riece variables on .emacs or file loaded from there."
   :group 'riece-options)
 
 (defcustom riece-quit-message nil
-  "Default signoff message."
-  :type '(radio (string :tag "Signoff message"))
+  "Default quit message."
+  :type '(radio (string :tag "Quit message"))
+  :group 'riece-options)
+
+(defcustom riece-away-message nil
+  "Default away message."
+  :type '(radio (string :tag "Away message"))
   :group 'riece-options)
 
 (defcustom riece-gather-channel-modes t
@@ -238,11 +245,6 @@ way is to put Riece variables on .emacs or file loaded from there."
   :type 'boolean
   :group 'riece-options)
 
-(defcustom riece-connection-timeout 60
-  "Default timeout interval."
-  :type 'integer
-  :group 'riece-server)
-  
 (defcustom riece-buffer-dispose-function #'bury-buffer
   "Function called after the buffer was disposed."
   :type 'function