* riece-options.el (riece-saved-forms): Add riece-layout.

[riece] / lisp / riece-options.el

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index 371ada3..f07712f 100644 (file)
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -38,7 +38,8 @@
 (defcustom riece-saved-forms
   '(riece-server-alist
     riece-channel-buffer-mode
-    riece-user-list-buffer-mode)
+    riece-user-list-buffer-mode
+    riece-layout)
   "Variables saved after each session is completed."
   :type 'string
   :group 'riece-options)
@@ -48,6 +49,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 +69,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 +101,14 @@ 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
+                         riece-menu)
   "Add-ons insinuated into Riece."
   :type '(repeat symbol)
   :group 'riece-options)
@@ -177,6 +185,12 @@ 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
@@ -233,11 +247,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