Menu
▾
▴
emacs-jabber configure.ac, NONE, 1.1 Makefile.am, NONE, 1.1 jabber-export.el, 1.8, 1.9 jabber-alert.el, 1.33, 1.34 jabber.el, 1.82, 1.83 jabber-sawfish.el, 1.2, 1.3 jabber-private.el, 1.2, 1.3 jabber-bookmarks.el, 1.7, 1.8 jabber-screen.el, 1.1, 1.2 jabber-festival.el, 1.1, 1.2 jabber-ratpoison.el, 1.1, 1.2 jabber-wmii.el, 1.2, 1.3 jabber-osd.el, 1.2, 1.3 jabber-xmessage.el, 1.2, 1.3 jabber-muc-nick-completion.el, 1.10, 1.11
|
From: Magnus H. <leg...@us...> - 2008-04-20 06:21:53
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv2509 Modified Files: jabber-export.el jabber-alert.el jabber.el jabber-sawfish.el jabber-private.el jabber-bookmarks.el jabber-screen.el jabber-festival.el jabber-ratpoison.el jabber-wmii.el jabber-osd.el jabber-xmessage.el jabber-muc-nick-completion.el Added Files: configure.ac Makefile.am Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-479 Creator: Magnus Henoch <ma...@fr...> Merge autotools and test suite Patches applied: * ma...@fr...--2005/emacs-jabber--autotools--0--base-0 tag of ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-477 * ma...@fr...--2005/emacs-jabber--autotools--0--patch-1 Add Makefile.am and configure.ac * ma...@fr...--2005/emacs-jabber--autotools--0--patch-2 Don't require jabber-muc-nick-completion from jabber-alert, but add an autoload * ma...@fr...--2005/emacs-jabber--autotools--0--patch-3 Require external notifiers from jabber.el, not jabber-alert.el * ma...@fr...--2005/emacs-jabber--autotools--0--patch-4 External notifiers require jabber-alert when compiling * ma...@fr...--2005/emacs-jabber--autotools--0--patch-5 Build autoloads * ma...@fr...--2005/emacs-jabber--autotools--0--patch-6 Break lines in Makefile.am * ma...@fr...--2005/emacs-jabber--autotools--0--patch-7 Rearrange Makefile.am to avoid circular dependency * ma...@fr...--2005/emacs-jabber--autotools--0--patch-8 Remove unnecessary BUILT_SOURCES * ma...@fr...--2005/emacs-jabber--autotools--0--patch-9 Add jabber.texi to Makefile.am * ma...@fr...--2005/emacs-jabber--autotools--0--patch-10 Maintainer-clean jabber-autoload.el * ma...@fr...--2005/emacs-jabber--autotools--0--patch-11 Distribute and install xmppuri.sh * ma...@fr...--2005/emacs-jabber--autotools--0--patch-12 Create zip file too * ma...@fr...--2005/emacs-jabber--autotools--0--patch-13 Remove explicit autoloads from jabber.el; add corresponding cookies * ma...@fr...--2005/emacs-jabber--autotools--0--patch-14 Merge CDATA fix * ma...@fr...--2005/emacs-jabber--autotools--0--patch-15 Add comment explaining double-compilation * ma...@fr...--2005/emacs-jabber--autotools--0--patch-16 Add test suite * ma...@fr...--2005/emacs-jabber--autotools--0--patch-17 Use subdirectory makefile for tests * ma...@fr...--2005/emacs-jabber--autotools--0--patch-18 Distribute tests * ma...@fr...--2005/emacs-jabber--autotools--0--patch-19 -Wall and -Werror for automake * ma...@fr...--2005/emacs-jabber--autotools--0--patch-20 Use makefile variables instead of autoconf ones Index: jabber-private.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-private.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jabber-private.el 12 Feb 2007 20:48:49 -0000 1.2 +++ jabber-private.el 20 Apr 2008 06:21:41 -0000 1.3 @@ -19,6 +19,7 @@ ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. +;;;###autoload (defun jabber-private-get (jc node-name namespace success-callback error-callback) "Retrieve an item from private XML storage. The item to retrieve is identified by NODE-NAME (a symbol) and @@ -42,6 +43,7 @@ (car (jabber-xml-node-children (jabber-iq-query xml-data))))) +;;;###autoload (defun jabber-private-set (jc fragment &optional success-callback success-closure-data error-callback error-closure-data) Index: jabber-xmessage.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-xmessage.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jabber-xmessage.el 16 Jan 2008 18:08:29 -0000 1.2 +++ jabber-xmessage.el 20 Apr 2008 06:21:42 -0000 1.3 @@ -19,6 +19,8 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +(eval-when-compile (require 'jabber-alert)) + (defcustom jabber-xmessage-timeout 15 "Timeout in seconds for xmessage alerts. Set this to nil to have no timeout." Index: jabber-ratpoison.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-ratpoison.el,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- jabber-ratpoison.el 31 Aug 2005 20:10:15 -0000 1.1 +++ jabber-ratpoison.el 20 Apr 2008 06:21:42 -0000 1.2 @@ -18,6 +18,8 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +(eval-when-compile (require 'jabber-alert)) + (defun jabber-ratpoison-message (msg) "Show MSG in Ratpoison" ;; Possible errors include not finding the ratpoison binary, and Index: jabber-sawfish.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-sawfish.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jabber-sawfish.el 7 May 2007 02:04:55 -0000 1.2 +++ jabber-sawfish.el 20 Apr 2008 06:21:41 -0000 1.3 @@ -18,6 +18,8 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +(eval-when-compile (require 'jabber-alert)) + (defcustom jabber-sawfish-display-time 3 "Time in seconds for displaying a jabber message through the Sawfish window manager." Index: jabber.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- jabber.el 27 Mar 2008 16:09:13 -0000 1.82 +++ jabber.el 20 Apr 2008 06:21:41 -0000 1.83 @@ -143,44 +143,17 @@ (require 'jabber-ft-server) (require 'jabber-socks5) -;; XXX: automate this some time -(autoload 'jabber-export-roster "jabber-export" - "Create buffer from which roster can be exported to a file." - t) -(autoload 'jabber-import-roster "jabber-export" - "Create buffer for roster import from FILE." - t) -(autoload 'jabber-compose "jabber-compose" - "Create a buffer for composing a Jabber message." - t) -(autoload 'jabber-private-get "jabber-private" - "Retrieve an item from private XML storage. -The item to retrieve is identified by NODE-NAME (a symbol) and -NAMESPACE (a string). -On success, SUCCESS-CALLBACK is called with the retrieved XML fragment. -On error, ERROR-CALLBACK is called with the entire IQ result." - nil) -(autoload 'jabber-private-set "jabber-private" - "Store FRAGMENT in private XML storage. -SUCCESS-CALLBACK, SUCCESS-CLOSURE-DATA, ERROR-CALLBACK and -ERROR-CLOSURE-DATA are used as in `jabber-send-iq'." - nil) -(autoload 'jabber-get-bookmarks "jabber-bookmarks" - "Retrieve bookmarks (if needed) and call CONT. -Arguments to CONT are JC and the bookmark list. CONT will be -called as the result of a filter function or a timer. -If REFRESH is non-nil, always fetch bookmarks." - nil) -(autoload 'jabber-edit-bookmarks "jabber-bookmarks" - "Create a buffer for editing bookmarks interactively." - t) -(autoload 'jabber-get-conference-data "jabber-bookmarks" - "Get bookmark data for CONFERENCE-JID. -KEY may be nil or one of :name, :autojoin, :nick and :password. -If KEY is nil, a plist containing the above keys is returned. -CONT is called when the result is available, with JC and the -result as arguments." - nil) +;; External notifiers +(require 'jabber-screen) +(require 'jabber-ratpoison) +(require 'jabber-sawfish) +(require 'jabber-festival) +(require 'jabber-xmessage) +(require 'jabber-wmii) +(require 'jabber-osd) + +(require 'jabber-autoload) + (defvar *jabber-current-status* nil "the users current presence staus") Index: jabber-muc-nick-completion.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc-nick-completion.el,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- jabber-muc-nick-completion.el 15 Apr 2008 13:47:27 -0000 1.10 +++ jabber-muc-nick-completion.el 20 Apr 2008 06:21:43 -0000 1.11 @@ -68,6 +68,7 @@ (assoc room jabber-muc-default-nicknames))) )) +;;;###autoload (defun jabber-muc-looks-like-personal-p (message &optional group) "Return non-nil if jabber MESSAGE is addresed to me. Optional argument GROUP to look." Index: jabber-export.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-export.el,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- jabber-export.el 20 Mar 2007 16:13:05 -0000 1.8 +++ jabber-export.el 20 Apr 2008 06:21:40 -0000 1.9 @@ -25,6 +25,7 @@ (defvar jabber-import-subscription-p-widget nil) +;;;###autoload (defun jabber-export-roster (jc) "Export roster for connection JC." (interactive (list (jabber-read-account))) @@ -59,6 +60,7 @@ (goto-char (point-min)) (switch-to-buffer (current-buffer)))) +;;;###autoload (defun jabber-import-roster (jc file) "Create buffer for roster import for connection JC from FILE." (interactive (list (jabber-read-account) Index: jabber-screen.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-screen.el,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- jabber-screen.el 31 Aug 2005 20:10:15 -0000 1.1 +++ jabber-screen.el 20 Apr 2008 06:21:42 -0000 1.2 @@ -18,6 +18,8 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +(eval-when-compile (require 'jabber-alert)) + (defun jabber-screen-message (msg) "Show MSG in screen" (call-process "screen" nil nil nil "-X" "echo" msg)) --- NEW FILE: configure.ac --- AC_INIT([jabber.el], [0.8.0], [ema...@li...], [emacs-jabber]) AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-zip]) AM_PATH_LISPDIR AC_CONFIG_FILES([Makefile tests/Makefile]) AC_OUTPUT --- NEW FILE: Makefile.am --- my_lisp_sources=fsm.el jabber-activity.el jabber-ahc-presence.el \ jabber-ahc.el jabber-alert.el jabber-autoaway.el jabber-avatar.el \ jabber-bookmarks.el jabber-browse.el jabber-chat.el \ jabber-chatbuffer.el jabber-chatstates.el jabber-compose.el \ jabber-conn.el jabber-core.el jabber-disco.el jabber-events.el \ jabber-export.el jabber-feature-neg.el jabber-festival.el \ jabber-ft-client.el jabber-ft-common.el jabber-ft-server.el \ jabber-gmail.el jabber-history.el jabber-iq.el jabber-keepalive.el \ jabber-keymap.el jabber-logon.el jabber-menu.el jabber-modeline.el \ jabber-muc-nick-completion.el jabber-muc.el jabber-newdisco.el \ jabber-osd.el jabber-presence.el jabber-private.el jabber-ratpoison.el \ jabber-register.el jabber-roster.el jabber-sasl.el jabber-sawfish.el \ jabber-screen.el jabber-search.el jabber-si-client.el \ jabber-si-common.el jabber-si-server.el jabber-socks5.el \ jabber-time.el jabber-truncate.el jabber-util.el \ jabber-vcard-avatars.el jabber-vcard.el jabber-version.el \ jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el \ jabber-xml.el jabber.el srv.el dist_lisp_LISP=$(my_lisp_sources) jabber-autoload.el MAINTAINERCLEANFILES=jabber-autoload.el # The autoload file will cause Lisp sources to be rebuilt _twice_: the # timestamp of the Lisp compilation is set _before_ the autoloads are # regenerated, which means that jabber-autoload.el is once again # considered new, which means that everything will be built again. # Suggestions welcome. jabber-autoload.el: $(my_lisp_sources) $(EMACS) --batch --eval "(setq generated-autoload-file \"$(abs_builddir)/$@\")" -f batch-update-autoloads $(srcdir) info_TEXINFOS=jabber.texi dist_libexec_SCRIPTS = xmppuri.sh SUBDIRS = . tests Index: jabber-festival.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-festival.el,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- jabber-festival.el 31 Aug 2005 20:10:15 -0000 1.1 +++ jabber-festival.el 20 Apr 2008 06:21:42 -0000 1.2 @@ -19,6 +19,8 @@ ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. +(eval-when-compile (require 'jabber-alert)) + (condition-case e (progn ;; Most people don't have Festival, so this will often fail Index: jabber-alert.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-alert.el,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- jabber-alert.el 17 Feb 2008 18:09:26 -0000 1.33 +++ jabber-alert.el 20 Apr 2008 06:21:41 -0000 1.34 @@ -21,7 +21,6 @@ (require 'jabber-util) -(require 'jabber-muc-nick-completion) ;jabber-muc-looks-like-personal-p needs for define-personal-jabber-alert (require 'cl) (defgroup jabber-alerts nil "auditory and visual alerts for jabber events" @@ -276,15 +275,6 @@ (define-jabber-alert beep "Beep on event" (lambda (&rest ignore) (beep))) -;; External notifiers -(require 'jabber-screen) -(require 'jabber-ratpoison) -(require 'jabber-sawfish) -(require 'jabber-festival) -(require 'jabber-xmessage) -(require 'jabber-wmii) -(require 'jabber-osd) - ;; Message alert hooks (defun jabber-message-default-message (from buffer text) (when (or jabber-message-alert-same-buffer Index: jabber-wmii.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-wmii.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jabber-wmii.el 15 May 2007 14:34:48 -0000 1.2 +++ jabber-wmii.el 20 Apr 2008 06:21:42 -0000 1.3 @@ -18,6 +18,8 @@ ;; along with this program; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +(eval-when-compile (require 'jabber-alert)) + (defvar jabber-wmii-color "#ffffff #335577 #447799" "Color specification as needed by the wmii window manager for the jabber alert messages.") Index: jabber-bookmarks.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-bookmarks.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- jabber-bookmarks.el 6 May 2007 14:53:11 -0000 1.7 +++ jabber-bookmarks.el 20 Apr 2008 06:21:41 -0000 1.8 @@ -29,6 +29,7 @@ XML elements. This is nil if bookmarks have not been retrieved, and t if no bookmarks where found.") +;;;###autoload (defun jabber-get-conference-data (jc conference-jid cont &optional key) "Get bookmark data for CONFERENCE-JID. KEY may be nil or one of :name, :autojoin, :nick and :password. @@ -65,6 +66,7 @@ :password (car (jabber-xml-node-children (car (jabber-xml-get-children node 'password))))))) +;;;###autoload (defun jabber-get-bookmarks (jc cont &optional refresh) "Retrieve bookmarks (if needed) and call CONT. Arguments to CONT are JC and the bookmark list. CONT will be @@ -99,6 +101,7 @@ callback t callback nil)) +;;;###autoload (defun jabber-edit-bookmarks (jc) "Create a buffer for editing bookmarks interactively." (interactive (list (jabber-read-account))) Index: jabber-osd.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-osd.el,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jabber-osd.el 19 Feb 2008 19:41:40 -0000 1.2 +++ jabber-osd.el 20 Apr 2008 06:21:42 -0000 1.3 @@ -19,6 +19,8 @@ ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. +(eval-when-compile (require 'jabber-alert)) + (condition-case e (progn ;; Most people don't have osd.el, so this will often fail |
