Menu
▾
▴
emacs-jabber jabber.el, 1.90, 1.91 jabber-bookmarks.el, 1.12, 1.13 jabber-chat.el, 1.91, 1.92 jabber-history.el, 1.31, 1.32 jabber-muc.el, 1.80, 1.81 jabber-avatar.el, 1.9, 1.10 jabber-events.el, 1.12, 1.13 jabber-chatstates.el, 1.3, 1.4 jabber-presence.el, 1.49, 1.50
|
From: Magnus H. <leg...@us...> - 2008-06-17 14:52:29
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15439 Modified Files: jabber.el jabber-bookmarks.el jabber-chat.el jabber-history.el jabber-muc.el jabber-avatar.el jabber-events.el jabber-chatstates.el jabber-presence.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-542 Creator: Magnus Henoch <ma...@fr...> More autoloading and un-warning Index: jabber-chatstates.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-chatstates.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- jabber-chatstates.el 26 Oct 2007 14:34:16 -0000 1.3 +++ jabber-chatstates.el 17 Jun 2008 14:52:23 -0000 1.4 @@ -22,6 +22,7 @@ ;; - Currently only active/composing notifications are /sent/ though all 5 ;; notifications are handled on receipt. +(require 'jabber-autoloads) (require 'cl) (defgroup jabber-chatstates nil @@ -31,9 +32,18 @@ (defconst jabber-chatstates-xmlns "http://jabber.org/protocol/chatstates" "XML namespace for the chatstates feature.") -;;; INCOMING -;;; Code for requesting chat state notifications from others and handling -;;; them. +(defcustom jabber-chatstates-confirm t + "Send notifications about chat states?" + :group 'jabber-chatstates + :type 'boolean) + +(defvar jabber-chatstates-requested 'first-time + "Whether or not chat states notification was requested. +This is one of the following: +first-time - send state in first stanza, then switch to nil +t - send states +nil - don't send states") +(make-variable-buffer-local 'jabber-chatstates-requested) (defvar jabber-chatstates-last-state nil "The last seen chat state.") @@ -43,6 +53,10 @@ "Human-readable presentation of chat state information") (make-variable-buffer-local 'jabber-chatstates-message) +;;; INCOMING +;;; Code for requesting chat state notifications from others and handling +;;; them. + (defun jabber-chatstates-update-message () (setq jabber-chatstates-message (if (and jabber-chatstates-last-state @@ -65,19 +79,6 @@ ;;; Code for handling requests for chat state notifications and providing ;;; them, modulo user preferences. -(defcustom jabber-chatstates-confirm t - "Send notifications about chat states?" - :group 'jabber-chatstates - :type 'boolean) - -(defvar jabber-chatstates-requested 'first-time - "Whether or not chat states notification was requested. -This is one of the following: -first-time - send state in first stanza, then switch to nil -t - send states -nil - don't send states") -(make-variable-buffer-local 'jabber-chatstates-requested) - (defvar jabber-chatstates-composing-sent nil "Has composing notification been sent? It can be sent and cancelled several times.") Index: jabber-chat.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-chat.el,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- jabber-chat.el 17 Jun 2008 14:51:41 -0000 1.91 +++ jabber-chat.el 17 Jun 2008 14:52:22 -0000 1.92 @@ -21,6 +21,7 @@ (require 'jabber-core) (require 'jabber-chatbuffer) (require 'jabber-history) +(require 'jabber-autoloads) (require 'ewoc) (eval-when-compile (require 'cl)) @@ -167,6 +168,7 @@ "Face used for error messages" :group 'jabber-chat) +;;;###autoload (defvar jabber-chatting-with nil "JID of the person you are chatting with") Index: jabber-avatar.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-avatar.el,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- jabber-avatar.el 8 Aug 2007 11:59:01 -0000 1.9 +++ jabber-avatar.el 17 Jun 2008 14:52:22 -0000 1.10 @@ -1,6 +1,6 @@ ;;; jabber-avatar.el --- generic functions for avatars -;; Copyright (C) 2006, 2007 Magnus Henoch +;; Copyright (C) 2006, 2007, 2008 Magnus Henoch ;; Author: Magnus Henoch <ma...@fr...> @@ -32,6 +32,7 @@ ;;; Code: +(require 'mailcap) (eval-when-compile (require 'cl)) ;;;; Variables Index: jabber.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- jabber.el 17 Jun 2008 14:51:40 -0000 1.90 +++ jabber.el 17 Jun 2008 14:52:21 -0000 1.91 @@ -194,17 +194,20 @@ (defgroup jabber-debug nil "debugging options" :group 'jabber) +;;;###autoload (defcustom jabber-debug-log-xml nil "log all XML i/o in *-jabber-xml-log-*" :type 'boolean :group 'jabber-debug) +;;;###autoload (defcustom jabber-debug-keep-process-buffers nil "If nil, kill process buffers when the process dies. Contents of process buffers might be useful for debugging." :type 'boolean :group 'jabber-debug) +;;;###autoload (defconst jabber-presence-faces '(("" . jabber-roster-user-online) ("away" . jabber-roster-user-away) @@ -215,6 +218,7 @@ (nil . jabber-roster-user-offline)) "Mapping from presence types to faces") +;;;###autoload (defconst jabber-presence-strings '(("" . "Online") ("away" . "Away") Index: jabber-presence.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-presence.el,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- jabber-presence.el 17 Jun 2008 14:51:41 -0000 1.49 +++ jabber-presence.el 17 Jun 2008 14:52:23 -0000 1.50 @@ -405,6 +405,7 @@ (jabber-read-with-input-method "status message: " *jabber-current-status* '*jabber-status-history*)))) (jabber-send-presence "xa" status *jabber-current-priority*)) +;;;###autoload (defun jabber-send-default-presence (&optional jc) "Send default presence. Default presence is specified by `jabber-default-priority', `jabber-default-show', Index: jabber-events.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-events.el,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- jabber-events.el 16 Jan 2008 17:48:18 -0000 1.12 +++ jabber-events.el 17 Jun 2008 14:52:23 -0000 1.13 @@ -19,6 +19,7 @@ ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. +(require 'jabber-autoloads) (require 'cl) (defgroup jabber-events nil Index: jabber-history.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-history.el,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- jabber-history.el 15 May 2008 23:36:28 -0000 1.31 +++ jabber-history.el 17 Jun 2008 14:52:22 -0000 1.32 @@ -33,6 +33,7 @@ (require 'jabber-core) (require 'jabber-util) +(require 'jabber-autoloads) (defgroup jabber-history nil "Customization options for Emacs Jabber history files." Index: jabber-muc.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc.el,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- jabber-muc.el 17 Jun 2008 14:51:41 -0000 1.80 +++ jabber-muc.el 17 Jun 2008 14:52:22 -0000 1.81 @@ -22,6 +22,7 @@ (require 'jabber-chat) (require 'jabber-widget) (require 'jabber-newdisco) +(require 'jabber-autoloads) (require 'cl) @@ -48,6 +49,7 @@ (defvar jabber-muc-topic "" "The topic of the current MUC room.") +;;;###autoload (defcustom jabber-muc-default-nicknames nil "Default nickname for specific MUC rooms." :group 'jabber-chat @@ -56,6 +58,7 @@ (string :tag "JID of room") (string :tag "Nickname")))) +;;;###autoload (defcustom jabber-muc-autojoin nil "List of MUC rooms to automatically join on connection. This list is saved in your Emacs customizations. You can also store @@ -136,6 +139,7 @@ :type 'sexp :group 'jabber-chat) +;;;###autoload (defvar jabber-muc-printers '() "List of functions that may be able to print part of a MUC message. This gets prepended to `jabber-chat-printers', which see.") @@ -710,6 +714,7 @@ (or (plist-get bookmark :nick) (plist-get (fsm-get-state-data jc) :username))))))))) +;;;###autoload (defun jabber-muc-message-p (message) "Return non-nil if MESSAGE is a groupchat message. That does not include private messages in a groupchat, but does Index: jabber-bookmarks.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-bookmarks.el,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- jabber-bookmarks.el 17 Jun 2008 14:46:42 -0000 1.12 +++ jabber-bookmarks.el 17 Jun 2008 14:52:22 -0000 1.13 @@ -20,6 +20,7 @@ (require 'jabber-private) (require 'jabber-widget) +(require 'jabber-autoloads) (require 'cl) @@ -60,6 +61,7 @@ (plist-get entry key) entry))) +;;;###autoload (defun jabber-parse-conference-bookmark (node) "Convert a <conference/> tag into a plist. The plist may contain the keys :jid, :name, :autojoin, |
