Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7697
Modified Files:
jabber.el jabber-core.el jabber-keymap.el
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-485
Creator: Magnus Henoch <ma...@fr...>
Add some autoload cookies
There are now enough cookies that (require 'jabber-autoloads) is now
sufficient to load jabber.el.
Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- jabber-core.el 28 Mar 2008 13:46:23 -0000 1.88
+++ jabber-core.el 24 Apr 2008 02:19:29 -0000 1.89
@@ -124,6 +124,10 @@
"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 @@
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)
Index: jabber.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- jabber.el 24 Apr 2008 02:19:18 -0000 1.86
+++ jabber.el 24 Apr 2008 02:19:29 -0000 1.87
@@ -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 @@
(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)
Index: jabber-keymap.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-keymap.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jabber-keymap.el 29 Aug 2007 01:45:36 -0000 1.10
+++ jabber-keymap.el 24 Apr 2008 02:19:29 -0000 1.11
@@ -1,6 +1,6 @@
;; jabber-keymap.el - common keymap for many modes
-;; Copyright (C) 2003, 2004, 2007 - Magnus Henoch - ma...@fr...
+;; Copyright (C) 2003, 2004, 2007, 2008 - Magnus Henoch - ma...@fr...
;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
;; 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)
|
