From 2ba20180fe7eceb942514bb6db85c2993c4336c9 Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Thu, 24 Apr 2008 02:19:29 +0000 Subject: [PATCH] Revision: mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-485 Creator: Magnus Henoch Add some autoload cookies There are now enough cookies that (require 'jabber-autoloads) is now sufficient to load jabber.el. --- jabber-core.el | 5 +++++ jabber-keymap.el | 4 +++- jabber.el | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/jabber-core.el b/jabber-core.el index a88fadd..ba168c7 100644 --- a/jabber-core.el +++ b/jabber-core.el @@ -124,6 +124,10 @@ problems." "Return non-nil if SASL functions are available." (featurep 'sasl)) +;; jabber-connect and jabber-connect-all should load jabber.el, not +;; just jabber-core.el, when autoloaded. + +;;;###autoload (autoload 'jabber-connect-all "jabber" "Connect to all configured Jabber accounts.\nSee `jabber-account-list'.\nIf no accounts are configured (or ARG supplied), call `jabber-connect' interactively." t) (defun jabber-connect-all (&optional arg) "Connect to all configured Jabber accounts. See `jabber-account-list'. @@ -153,6 +157,7 @@ If no accounts are configured (or ARG supplied), call `jabber-connect' interacti nil password network-server port connection-type)))))))) +;;;###autoload (autoload 'jabber-connect "jabber" "Connect to the Jabber server and start a Jabber XML stream.\nWith prefix argument, register a new account.\nWith double prefix argument, specify more connection details." t) (defun jabber-connect (username server resource &optional registerp password network-server port connection-type) diff --git a/jabber-keymap.el b/jabber-keymap.el index 90b8da5..6be8833 100644 --- a/jabber-keymap.el +++ b/jabber-keymap.el @@ -1,6 +1,6 @@ ;; jabber-keymap.el - common keymap for many modes -;; Copyright (C) 2003, 2004, 2007 - Magnus Henoch - mange@freemail.hu +;; Copyright (C) 2003, 2004, 2007, 2008 - Magnus Henoch - mange@freemail.hu ;; Copyright (C) 2002, 2003, 2004 - tom berger - object@intelectronica.net ;; This file is a part of jabber.el. @@ -39,6 +39,7 @@ (define-key map [backtab] 'backward-button)) map)) +;;;###autoload (defvar jabber-global-keymap (let ((map (make-sparse-keymap))) (define-key map "\C-c" 'jabber-connect-all) @@ -53,6 +54,7 @@ map) "Global Jabber keymap (usually under C-x C-j)") +;;;###autoload (define-key ctl-x-map "\C-j" jabber-global-keymap) (provide 'jabber-keymap) diff --git a/jabber.el b/jabber.el index 7c65a6d..86bc72f 100644 --- a/jabber.el +++ b/jabber.el @@ -30,6 +30,7 @@ (defgroup jabber nil "Jabber instant messaging" :group 'applications) +;;;###autoload (defcustom jabber-account-list nil "List of Jabber accounts. Each element of the list is a cons cell describing a Jabber account, @@ -213,11 +214,13 @@ configure a Google Talk account like this: (nil . "Offline")) "Mapping from presence types to readable strings") +;;;###autoload (defun jabber-customize () "customize jabber options" (interactive) (customize-group 'jabber)) +;;;###autoload (defun jabber-info () "open jabber.el manual" (interactive)