X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-options.el;h=945c699f58d9c16ab5a66e011644e98419b4299a;hb=c29e67d9775fc091a53a59d8fb315ef2e05bd46b;hp=cafcc4dfc1b87ada5ac09486174a71df083d5542;hpb=0f85740dec975e05f89527adf5dc59ea80f54a0b;p=riece

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index cafcc4d..945c699 100644
--- 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,17 +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-inhibit-startup-message nil
-  "If non-nil, the startup message will not be displayed."
-  :group 'riece-looks
-  :type 'boolean)
-
-(defcustom riece-directory "~/.riece"
+(defcustom riece-directory (expand-file-name "~/.riece")
   "Where to look for data files."
   :type 'directory
   :group 'riece-options)
@@ -105,7 +101,15 @@ 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
+			  riece-icon)
   "Add-ons insinuated into Riece."
   :type '(repeat symbol)
   :group 'riece-options)
@@ -184,7 +188,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 +197,12 @@ 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 '(radio (integer :tag "Seconds")
+		(const nil))
+  :group 'riece-server)
+
 (defcustom riece-channel-buffer-mode t
   "When non-nil, Riece will display a channel buffer."
   :type 'boolean
@@ -208,12 +219,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,25 +235,36 @@ 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-gather-channel-modes t
+(defcustom riece-away-message nil
+  "Default away message."
+  :type '(radio (string :tag "Away message"))
+  :group 'riece-options)
+
+(defcustom riece-gather-channel-modes nil
   "If non-nil, gather channel modes when we join a channel."
   :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
   :group 'riece-options)
 
+(defcustom riece-shrink-buffer-idle-time-delay 5
+  "Number of idle seconds to wait before shrinking channel buffers."
+  :type 'integer
+  :group 'riece-options)
+
+(defcustom riece-max-buffer-size 65535
+  "Maximum size of channel buffers."
+  :type '(radio (integer :tag "Number of characters")
+		(const nil))
+  :group 'riece-options)
+
 (defcustom riece-format-time-function #'current-time-string
   "Function to convert the specified time to the human readable form."
   :type 'function