Remove most autoload cookies for defcustoms

They shouldn't be used just to have them listed in Customize; see
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14247 .  Besides, they
should be loaded by the requires in jabber.el anyway.

I left jabber-account-list and jabber-display-menu in for now, as they
are involved in a complicated dance regarding whether to display the
Jabber menu by default.  Need to solve this somehow and get rid of
those two autoload cookies as well.
This commit is contained in:
Magnus Henoch 2013-05-08 00:59:16 +01:00
parent 022ce34c46
commit b5fbebdc33
3 changed files with 0 additions and 10 deletions

View File

@ -33,13 +33,11 @@
"Keepalive functions try to detect lost connection" "Keepalive functions try to detect lost connection"
:group 'jabber) :group 'jabber)
;;;###autoload
(defcustom jabber-keepalive-interval 600 (defcustom jabber-keepalive-interval 600
"Interval in seconds between connection checks." "Interval in seconds between connection checks."
:type 'integer :type 'integer
:group 'jabber-keepalive) :group 'jabber-keepalive)
;;;###autoload
(defcustom jabber-keepalive-timeout 20 (defcustom jabber-keepalive-timeout 20
"Seconds to wait for response from server." "Seconds to wait for response from server."
:type 'integer :type 'integer
@ -127,7 +125,6 @@ for all accounts regardless of the argument."
;;; enable keepalive by default... Whitespace pings are light and ;;; enable keepalive by default... Whitespace pings are light and
;;; unobtrusive. ;;; unobtrusive.
;;;###autoload
(defcustom jabber-whitespace-ping-interval 30 (defcustom jabber-whitespace-ping-interval 30
"Send a space character to the server with this interval, in seconds. "Send a space character to the server with this interval, in seconds.

View File

@ -60,7 +60,6 @@ Values are lists of nickname strings.")
(defvar jabber-muc-nickname-history () (defvar jabber-muc-nickname-history ()
"Keeps track of previously referred-to nicknames") "Keeps track of previously referred-to nicknames")
;;;###autoload
(defcustom jabber-muc-default-nicknames nil (defcustom jabber-muc-default-nicknames nil
"Default nickname for specific MUC rooms." "Default nickname for specific MUC rooms."
:group 'jabber-chat :group 'jabber-chat
@ -69,7 +68,6 @@ Values are lists of nickname strings.")
(string :tag "JID of room") (string :tag "JID of room")
(string :tag "Nickname")))) (string :tag "Nickname"))))
;;;###autoload
(defcustom jabber-muc-autojoin nil (defcustom jabber-muc-autojoin nil
"List of MUC rooms to automatically join on connection. "List of MUC rooms to automatically join on connection.
This list is saved in your Emacs customizations. You can also store This list is saved in your Emacs customizations. You can also store

View File

@ -88,7 +88,6 @@ configure a Google Talk account like this:
(const :tag "Legacy SSL/TLS" ssl)))))) (const :tag "Legacy SSL/TLS" ssl))))))
:group 'jabber) :group 'jabber)
;;;###autoload
(defcustom jabber-default-show "" (defcustom jabber-default-show ""
"default show state" "default show state"
:type '(choice (const :tag "Online" "") :type '(choice (const :tag "Online" "")
@ -98,13 +97,11 @@ configure a Google Talk account like this:
(const :tag "Do not disturb" "dnd")) (const :tag "Do not disturb" "dnd"))
:group 'jabber) :group 'jabber)
;;;###autoload
(defcustom jabber-default-status "" (defcustom jabber-default-status ""
"default status string" "default status string"
:type 'string :type 'string
:group 'jabber) :group 'jabber)
;;;###autoload
(defcustom jabber-default-priority 10 (defcustom jabber-default-priority 10
"default priority" "default priority"
:type 'integer :type 'integer
@ -196,7 +193,6 @@ configure a Google Talk account like this:
(defgroup jabber-debug nil "debugging options" (defgroup jabber-debug nil "debugging options"
:group 'jabber) :group 'jabber)
;;;###autoload
(defcustom jabber-debug-log-xml nil (defcustom jabber-debug-log-xml nil
"Set to non-nil to log all XML i/o in *-jabber-console-JID-* buffer. Set to string to also dump XML i/o in specified file." "Set to non-nil to log all XML i/o in *-jabber-console-JID-* buffer. Set to string to also dump XML i/o in specified file."
:type '(choice (const :tag "Do not dump XML i/o" nil) :type '(choice (const :tag "Do not dump XML i/o" nil)
@ -204,7 +200,6 @@ configure a Google Talk account like this:
(string :tag "Dump XML i/o in console and this file")) (string :tag "Dump XML i/o in console and this file"))
:group 'jabber-debug) :group 'jabber-debug)
;;;###autoload
(defcustom jabber-debug-keep-process-buffers nil (defcustom jabber-debug-keep-process-buffers nil
"If nil, kill process buffers when the process dies. "If nil, kill process buffers when the process dies.
Contents of process buffers might be useful for debugging." Contents of process buffers might be useful for debugging."