X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-options.el;h=700bfc27ccf591e7ef95e791143195b018f9969d;hp=e76b3bbc5df53a134c5c33f31550eef8f4c25bfc;hb=f15cbe12cae76dde3d7abe27d183bc8de58bbbc7;hpb=14b2f20ab2cf572cdf1113747dbc9d52c5aee374

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index e76b3bb..700bfc2 100644
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -48,6 +48,11 @@
   :type 'boolean
   :group 'riece-options)
 
+(defcustom riece-command-prefix "\C-c"
+  "Key sequence to be used as prefix for command mode key bindings."
+  :type 'string
+  :group 'riece-options)
+
 (defgroup riece-looks nil
   "Related to look and feel"
   :prefix "riece-"
@@ -63,12 +68,7 @@
   :type 'boolean
   :group 'riece-looks)
 
-(defcustom riece-tab-stop-list '(2 4 6 8 10 12 14 16)
-  "To override `tab-stop-list'."
-  :type '(repeat integer)
-  :group 'riece-looks)
-
-(defcustom riece-directory "~/.riece"
+(defcustom riece-directory (expand-file-name "~/.riece")
   "Where to look for data files."
   :type 'directory
   :group 'riece-options)
@@ -100,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)
@@ -177,12 +183,18 @@ way is to put Riece variables on .emacs or file loaded from there."
   :type 'string
   :group 'riece-server)
 
+(defcustom riece-startup-channel-list nil
+  "A list of channels to join automatically at startup."
+  :type '(repeat (choice (string :tag "Channel")
+			 (list (string :tag "Channel") (string :tag "Key"))))
+  :group 'riece-channel)
+
 (defcustom riece-retry-with-new-nickname nil
   "When nickname has already been in use, grow-tail automatically."
   :type 'boolean
   :group 'riece-server)
 
-(defcustom riece-quit-timeout 60
+(defcustom riece-quit-timeout 10
   "Quit timeout when there is no response from server."
   :type 'integer
   :group 'riece-server)
@@ -233,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