Merge strict-naming branch.

[riece] / lisp / riece-options.el

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index aa86dbb..333fd5c 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
@@ -182,11 +177,6 @@ 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 (string :tag "Startup Channel"))
-  :group 'riece-channel)
-
 (defcustom riece-retry-with-new-nickname nil
   "When nickname has already been in use, grow-tail automatically."
   :type 'boolean