Menu
▾
▴
emacs-jabber-commit — jabber.el commit messages
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(13) |
Jun
(3) |
Jul
(4) |
Aug
(30) |
Sep
(17) |
Oct
(2) |
Nov
(6) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(9) |
Feb
(30) |
Mar
(22) |
Apr
(23) |
May
(25) |
Jun
(25) |
Jul
(4) |
Aug
(21) |
Sep
(16) |
Oct
(44) |
Nov
(15) |
Dec
(3) |
| 2009 |
Jan
(9) |
Feb
(6) |
Mar
(2) |
Apr
(2) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(2) |
Oct
(3) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
| 2012 |
Jan
|
Feb
(3) |
Mar
|
Apr
(3) |
May
(2) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
(3) |
Feb
(4) |
Mar
|
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(10) |
Dec
|
| 2014 |
Jan
(6) |
Feb
(2) |
Mar
|
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(2) |
Aug
(6) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
(2) |
| 2015 |
Jan
(1) |
Feb
(2) |
Mar
(2) |
Apr
(6) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Magnus H. <leg...@us...> - 2008-04-25 18:52:15
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3135 Modified Files: configure.ac Makefile.am Added Files: jabber-pkg.el.in Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-490 Creator: Magnus Henoch <ma...@fr...> _Really_ add jabber-pkg.el.in. Don't distribute jabber-pkg.el in non-ELPA builds. Index: configure.ac =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- configure.ac 24 Apr 2008 02:19:18 -0000 1.3 +++ configure.ac 25 Apr 2008 18:52:09 -0000 1.4 @@ -11,5 +11,5 @@ AM_CONDITIONAL([USE_OUR_SHA1], [test x$HAVE_SHA1 = xno -a x$HAVE_SHA1_EL = xno]) AM_CONDITIONAL([USE_OUR_HEX_UTIL], [test x$HAVE_HEX_UTIL = xno]) -AC_CONFIG_FILES([Makefile tests/Makefile jabber-pkg.el]) +AC_CONFIG_FILES([Makefile tests/Makefile]) AC_OUTPUT Index: Makefile.am =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 24 Apr 2008 02:19:18 -0000 1.3 +++ Makefile.am 25 Apr 2008 18:52:09 -0000 1.4 @@ -30,7 +30,7 @@ dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el MAINTAINERCLEANFILES=jabber-autoloads.el -EXTRA_DIST = jabber-pkg.el +EXTRA_DIST = jabber-pkg.el.in # The autoload file will cause Lisp sources to be rebuilt _twice_: the # timestamp of the Lisp compilation is set _before_ the autoloads are @@ -48,11 +48,14 @@ # Package everything in a form suitable for ELPA. That is, use # "jabber" instead of "emacs-jabber" as base name. +CLEANFILES = jabber-pkg.el elpa: dist rm -rf emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION) $(AMTAR) xzf emacs-jabber-$(PACKAGE_VERSION).tar.gz mv emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION) cd jabber-$(PACKAGE_VERSION) ; install-info jabber.info dir + sed "s/@""PACKAGE_VERSION@""/$(PACKAGE_VERSION)/" < $(srcdir)/jabber-pkg.el.in > jabber-$(PACKAGE_VERSION)/jabber-pkg.el $(AMTAR) chf jabber-$(PACKAGE_VERSION).tar jabber-$(PACKAGE_VERSION) rm -rf jabber-$(PACKAGE_VERSION) @echo "Created jabber-$(PACKAGE_VERSION).tar" + --- NEW FILE: jabber-pkg.el.in --- ;; For ELPA: http://tromey.com/elpa/ (define-package "jabber" "@PACKAGE_VERSION@" "A Jabber client for Emacs.") ;; arch-tag: fa652136-12f7-11dd-b4c4-000a95c2fcd0 |
|
From: Magnus H. <leg...@us...> - 2008-04-25 14:51:30
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30666 Modified Files: jabber.texi NEWS Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-489 Creator: Magnus Henoch <ma...@fr...> Document jabber-chat-buffer-show-avatar Index: NEWS =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- NEWS 24 Apr 2008 02:19:59 -0000 1.67 +++ NEWS 25 Apr 2008 14:51:04 -0000 1.68 @@ -41,7 +41,7 @@ subscription" section in manual. ** Option: hide avatar in chat buffer -`jabber-chat-buffer-show-avatar'. (not documented yet) +`jabber-chat-buffer-show-avatar'. ** Gmail notifications (Not documented nor autoloaded) Index: jabber.texi =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- jabber.texi 24 Apr 2008 02:19:59 -0000 1.87 +++ jabber.texi 25 Apr 2008 14:51:04 -0000 1.88 @@ -815,6 +815,7 @@ @vindex jabber-vcard-avatars-retrieve @vindex jabber-vcard-avatars-publish @vindex jabber-avatar-cache-directory +@vindex jabber-chat-buffer-show-avatar jabber.el supports viewing and publishing avatars according to XEP-0153, vCard-Based Avatars. By default, if you have an avatar in your vCard @@ -825,7 +826,9 @@ To disable retrieval of other people's avatars, set @code{jabber-vcard-avatars-retrieve} to nil. To disable publishing of -your own avatar, set @code{jabber-vcard-avatars-publish} to nil. +your own avatar, set @code{jabber-vcard-avatars-publish} to nil. To +disable avatars in chat buffer header lines, set +@code{jabber-chat-buffer-show-avatar} to nil. Avatars are cached in the directory specified by @code{jabber-avatar-cache-directory}, by default |
|
From: Magnus H. <leg...@us...> - 2008-04-24 02:20:05
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7746 Modified Files: README jabber.texi NEWS Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-488 Creator: Magnus Henoch <ma...@fr...> More documentation hacking Index: README =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/README,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- README 24 Apr 2008 02:19:38 -0000 1.21 +++ README 24 Apr 2008 02:19:59 -0000 1.22 @@ -71,8 +71,8 @@ After installation by either method, add (load "jabber-autoloads") to your .emacs file. -Also, users upgrading from 0.7-0.7.x may meet some configuration -issues. Please, report them as bugs in tracker, to help update docs. +If you are upgrading from 0.7-0.7.x, you need to update your +configuration. See the section "Account settings" in the manual. Usage ===== Index: NEWS =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- NEWS 21 Feb 2008 15:16:23 -0000 1.66 +++ NEWS 24 Apr 2008 02:19:59 -0000 1.67 @@ -2,6 +2,10 @@ * New features in jabber.el 0.8 +** Support for multiple accounts +Configuration variables have changed. See section "Account settings" +in the manual. + ** OSD alerts (message, MUC, MUC-personal) ** Family of personal MUC alerts added @@ -10,16 +14,13 @@ ** MUC nicks completion See sectin "Groupchat" in manual. -** Support for multiple accounts -See section "Account settings" in manual. - ** Automatic reconnection Not enabled by default; See "Reconnecting" section in manual. -** support for XEP-0085 +** Support for XEP-0085 This means "contact is typing" notifications when chatting with Gajim or Google Talk users, among others. -See "XEP-0085" section in manual +See "Typing notifications" section in the manual. ** Option: hide offline contacts in roster See "The roster buffer" in manual. Index: jabber.texi =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- jabber.texi 24 Apr 2008 02:19:48 -0000 1.86 +++ jabber.texi 24 Apr 2008 02:19:59 -0000 1.87 @@ -53,7 +53,7 @@ * Time queries:: * Useful features:: * Message history:: -* Message events:: +* Typing notifications:: * Roster import and export:: * XMPP URIs:: * Customization:: @@ -130,7 +130,8 @@ I'll assume that you have already successfully installed jabber.el; if not, consult the @file{README} file. Also, make sure you have -@code{(require 'jabber)} in your @file{.emacs}. +@code{(require 'jabber)} or @code{(load "jabber-autoloads")}in your +@file{.emacs}. Now, type @kbd{M-x jabber-customize}. This brings up a customize buffer for jabber.el. One variable to customize are @@ -379,7 +380,7 @@ @menu * Automation:: -* Bookmarks:: +* Bookmarks:: * Invitations:: * Private messages:: * MUC Administration:: @@ -863,7 +864,7 @@ * Autoaway:: * Modeline status:: * Keepalive:: -* Reconnecting:: +* Reconnecting:: * Tracking activity:: * Watch buddies:: * Spell checking:: @@ -1055,7 +1056,7 @@ For more information about Emacs spell checking, @xref{Spelling, , Checking and Correcting Spelling, emacs, GNU Emacs Manual}. -@node Message history, Message events, Useful features, Top +@node Message history, Typing notifications, Useful features, Top @chapter Message history @cindex History @@ -1120,8 +1121,14 @@ Truncation limit may be set by customizing @code{jabber-log-lines-to-keep} variable. -@node Message events, Roster import and export, Message history, Top -@chapter Message events +@node Typing notifications, Roster import and export, Message history, Top +@chapter Typing notifications + +There are two protocols for ``contact is typing'' notifications in +Jabber. jabber.el supports both of them, displaying various information +in the header line of chat buffers. + +@section Message events @cindex Composing @cindex Delivered @@ -1131,9 +1138,9 @@ @vindex jabber-events-confirm-displayed @vindex jabber-events-confirm-composing -In the status line of the chat buffer, you can sometimes see -notifications about the progress of the message you just sent. These -states are possible: +The older protocol is called Message Events (@pxref{XEP-0022}). Besides +typing notification, it lets you know what happens to the messages you send. +These states are possible: @itemize @bullet @item @@ -1146,7 +1153,7 @@ Displayed to user @item -User is composing a reply +User is typing a message @end itemize @@ -1161,7 +1168,40 @@ not to request such information by customizing @code{jabber-events-request-these}. -@node Roster import and export, XMPP URIs, Message events, Top +@section Chat states + +@vindex jabber-chatstates-confirm + +The newer protocol is called Chat States (@pxref{XEP-0085}). Rather +than dealing with individual messages, it describes the state of the +chat session between two people. The following states are possible: + +@itemize @bullet +@item +Active (the default state, not displayed) + +@item +Inactive + +@item +Composing + +@item +Paused (i.e., taking a short pause in composing) + +@item +Gone + +@end itemize + +jabber.el can display all five states, but only ever sends ``active'' +and ``composing'' itself. + +To customize sending of chat states, customize the variable +@code{jabber-chatstates-confirm}. + + +@node Roster import and export, XMPP URIs, Typing notifications, Top @chapter Roster import and export @findex jabber-export-roster @@ -1273,12 +1313,56 @@ @cindex Password @cindex JID @cindex Resource +@cindex Network server All account settings reside in @code{jabber-account-list} variable. -By customizing it, you cat set JID, password, resource, and turn -account on/off. Optionally, you can set alternative network server, -port and connection type. See comments for this variable to learn how -to set it up. +Usually you only need to set the JID, in the form +@samp{username@@server} (or @samp{username@@server/resource} to use a +specific resource name). These are the other account options: + +@table @asis +@item Disabled +If the account is disabled, @code{jabber-connect-all} will not attempt +to connect it. You can still connect it manually with +@code{jabber-connect}. + +@item Password +You can set the password of the account, so you don't have to enter it +when you connect. Note that it will be stored unencrypted in your +customization file. + +@item Network server +If the JID of the Jabber server is not also its DNS name, you may have +to enter the real DNS name or IP address of the server here. + +@item Connection type +This option specifies whether to use an encrypted connection to the +server. Usually you want ``STARTTLS'' (@code{starttls}), which means +that encryption is activated if the server supports it. The other +possibilities are ``unencrypted'' (@code{network}), which means just +that, and ``legacy SSL/TLS'' (@code{ssl}), which means that encryption +is activated on connection. + +@item Port +If the Jabber server uses a nonstandard port, specify it here. The +default is 5222 for STARTTLS and unencrypted connections, and 5223 for +legacy SSL connections. +@end table + +@subsection For Google Talk + +@cindex Google Talk + +If you have a very new version of @file{dns.el}, you can connect to +Google Talk just by specifying your Gmail address. If not, set +``network server'' to @kbd{talk.google.com} and ``connection type'' to +``legacy SSL''. + +@subsection Upgrade note + +Previous versions of jabber.el had the variables @code{jabber-username}, +@code{jabber-server}, @code{jabber-resource} and +@code{jabber-password}. These are now obsolete and not used. @node Miscellaneous settings, Customizing the roster buffer, Account settings, Customization @section Miscellaneous settings @@ -2198,9 +2282,6 @@ notifications are @emph{sent} though all five notifications are handled on receipt. -To customize sending of chat states, customize -@code{jabber-chatstates-confirm} variable. - @node XEP-0086, XEP-0090, XEP-0085, Protocol support @section XEP-0086 (Error Condition Mappings) |
|
From: Magnus H. <leg...@us...> - 2008-04-24 02:19:53
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7727 Modified Files: jabber.texi Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-487 Creator: Magnus Henoch <ma...@fr...> Update website URL in manual Index: jabber.texi =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- jabber.texi 4 Mar 2008 15:01:53 -0000 1.85 +++ jabber.texi 24 Apr 2008 02:19:48 -0000 1.86 @@ -94,7 +94,7 @@ @email{object@@intellectronica.net}, JID @code{object@@jabber.org.uk}) and Magnus Henoch (e-mail @email{mange@@freemail.hu}, JID @code{legoscia@@jabber.cd.chalmers.se}). There is a web page at -@uref{http://intellectronica.net/emacs-jabber/}, and a Sourceforge +@uref{http://emacs-jabber.sf.net/}, and a Sourceforge project page at @uref{http://sourceforge.net/projects/emacs-jabber}. @node Basic operation, Groupchat, Introduction, Top |
|
From: Magnus H. <leg...@us...> - 2008-04-24 02:19:44
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7713 Modified Files: README Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-486 Creator: Magnus Henoch <ma...@fr...> Update installation instructions in README Index: README =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/README,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- README 23 Apr 2008 12:10:42 -0000 1.20 +++ README 24 Apr 2008 02:19:38 -0000 1.21 @@ -64,10 +64,12 @@ ./configure EMACS=emacs-or-xemacs-21.4 You can also install jabber.el by hand. Put all .el files somewhere -in your load-path (or have your load-path include the directory -they're in) and put (require 'jabber) in your .emacs file. To install -the Info documentation, copy jabber.info to /usr/local/info and run -"install-info /usr/local/info/jabber.info". +in your load-path, or have your load-path include the directory +they're in. To install the Info documentation, copy jabber.info to +/usr/local/info and run "install-info /usr/local/info/jabber.info". + +After installation by either method, add (load "jabber-autoloads") to +your .emacs file. Also, users upgrading from 0.7-0.7.x may meet some configuration issues. Please, report them as bugs in tracker, to help update docs. |
|
From: Magnus H. <leg...@us...> - 2008-04-24 02:19:33
|
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) |
|
From: Magnus H. <leg...@us...> - 2008-04-24 02:19:23
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7675 Modified Files: jabber.el configure.ac Makefile.am Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-484 Creator: Magnus Henoch <ma...@fr...> Rename jabber-autoload to jabber-autoloads. Add elpa target. Index: configure.ac =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- configure.ac 20 Apr 2008 11:44:07 -0000 1.2 +++ configure.ac 24 Apr 2008 02:19:18 -0000 1.3 @@ -11,5 +11,5 @@ AM_CONDITIONAL([USE_OUR_SHA1], [test x$HAVE_SHA1 = xno -a x$HAVE_SHA1_EL = xno]) AM_CONDITIONAL([USE_OUR_HEX_UTIL], [test x$HAVE_HEX_UTIL = xno]) -AC_CONFIG_FILES([Makefile tests/Makefile]) +AC_CONFIG_FILES([Makefile tests/Makefile jabber-pkg.el]) AC_OUTPUT Index: Makefile.am =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 20 Apr 2008 11:44:07 -0000 1.2 +++ Makefile.am 24 Apr 2008 02:19:18 -0000 1.3 @@ -27,15 +27,17 @@ compat_lisp_sources += compat/hex-util.el endif -dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoload.el -MAINTAINERCLEANFILES=jabber-autoload.el +dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el +MAINTAINERCLEANFILES=jabber-autoloads.el + +EXTRA_DIST = jabber-pkg.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) +jabber-autoloads.el: $(my_lisp_sources) $(EMACS) --batch --eval "(setq generated-autoload-file \"$(abs_builddir)/$@\")" -f batch-update-autoloads $(srcdir) info_TEXINFOS=jabber.texi @@ -44,3 +46,13 @@ SUBDIRS = . tests +# Package everything in a form suitable for ELPA. That is, use +# "jabber" instead of "emacs-jabber" as base name. +elpa: dist + rm -rf emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION) + $(AMTAR) xzf emacs-jabber-$(PACKAGE_VERSION).tar.gz + mv emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION) + cd jabber-$(PACKAGE_VERSION) ; install-info jabber.info dir + $(AMTAR) chf jabber-$(PACKAGE_VERSION).tar jabber-$(PACKAGE_VERSION) + rm -rf jabber-$(PACKAGE_VERSION) + @echo "Created jabber-$(PACKAGE_VERSION).tar" Index: jabber.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- jabber.el 23 Apr 2008 12:10:33 -0000 1.85 +++ jabber.el 24 Apr 2008 02:19:18 -0000 1.86 @@ -152,7 +152,7 @@ (require 'jabber-wmii) (require 'jabber-osd) -(load "jabber-autoload") +(load "jabber-autoloads") (defvar *jabber-current-status* nil |
|
From: Magnus H. <leg...@us...> - 2008-04-23 12:10:54
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv444 Modified Files: README Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-483 Creator: Magnus Henoch <ma...@fr...> Update README Index: README =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/README,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- README 21 Feb 2008 14:32:00 -0000 1.19 +++ README 23 Apr 2008 12:10:42 -0000 1.20 @@ -1,5 +1,6 @@ -This is jabber.el 0.8, a Jabber client for Emacs. If you don't know -what Jabber is, see http://www.jabber.org . +This is jabber.el 0.8, a Jabber client for Emacs. Jabber (also known +as XMPP) is an instant messaging system; see http://www.jabber.org for +more information. Home page: http://emacs-jabber.sourceforge.net Project page: http://sourceforge.net/projects/emacs-jabber @@ -13,8 +14,9 @@ jabber.el depends on GNU Emacs (21, 22, 23 works fine), in particular xml.el, and some files from Gnus 5.10. If you don't have Gnus 5.10 -(M-x gnus-version will tell), you can download sha1.el and hex-util.el -from Gnus CVS at http://quimby.gnus.org/cgi-bin/cvsweb.cgi/gnus/lisp/ +(M-x gnus-version will tell), you can get sha1.el and hex-util.el +from the compat subdirectory. (The configure script tries to detect +this situation and include the files in the build) XEmacs @@ -53,26 +55,30 @@ Installation ============ -To install, put all .el files somewhere in your load-path (or have -your load-path include the directory they're in) and put -(require 'jabber) in your .emacs file. To install the Info -documentation, copy jabber.info to /usr/local/info and run -"install-info /usr/local/info/jabber.info". +jabber.el can be installed using the commands: +./configure +make +make install -If you've been using a post-0.6 CVS version of jabber.el, you might -need to remove some redundant hook functions. Make sure that -jabber-alert-message-hooks doesn't contain jabber-message-history, and -that jabber-alert-presence-hooks doesn't contain -jabber-presence-watch. +You can specify which emacs you want to use: +./configure EMACS=emacs-or-xemacs-21.4 + +You can also install jabber.el by hand. Put all .el files somewhere +in your load-path (or have your load-path include the directory +they're in) and put (require 'jabber) in your .emacs file. To install +the Info documentation, copy jabber.info to /usr/local/info and run +"install-info /usr/local/info/jabber.info". Also, users upgrading from 0.7-0.7.x may meet some configuration issues. Please, report them as bugs in tracker, to help update docs. Usage ===== -To start using it, type M-x jabber-customize and set your username and -server. Then, type C-x C-j C-c (or equivalently M-x jabber-connect) -to connect (with prefix argument, register new account). + +To connect to a Jabber server, type C-x C-j C-c (or equivalently M-x +jabber-connect-all) and enter your JID. With prefix argument, +register a new account. You can set your JID permanently with M-x +jabber-customize. Your roster is displayed in a buffer called *-jabber-*. To disconnect, type C-x C-j C-d or M-x jabber-disconnect. |
|
From: Magnus H. <leg...@us...> - 2008-04-23 12:10:40
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv427 Modified Files: jabber.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-482 Creator: Magnus Henoch <ma...@fr...> Put jabber-account-list in customize group "jabber" Index: jabber.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- jabber.el 20 Apr 2008 11:44:07 -0000 1.84 +++ jabber.el 23 Apr 2008 12:10:33 -0000 1.85 @@ -85,7 +85,7 @@ (const :tag "STARTTLS" starttls) (const :tag "Unencrypted" network) (const :tag "Legacy SSL/TLS" ssl)))))) - :group 'jabber-core) + :group 'jabber) (defcustom jabber-default-show "" "default show state" |
|
From: Magnus H. <leg...@us...> - 2008-04-23 12:10:31
|
Update of /cvsroot/emacs-jabber/emacs-jabber/m4 In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv407/m4 Modified Files: emacs-lib.m4 Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-481 Creator: Magnus Henoch <ma...@fr...> Use AC_RUN_LOG when trying emacs code Index: emacs-lib.m4 =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/m4/emacs-lib.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- emacs-lib.m4 20 Apr 2008 11:44:08 -0000 1.1 +++ emacs-lib.m4 23 Apr 2008 12:10:22 -0000 1.2 @@ -6,7 +6,8 @@ [cat >conftest.el <<EOF $1 EOF -AS_IF([$EMACS -batch -l conftest.el >/dev/null 2>&1], [$2], [$3])]) +AC_RUN_LOG([$EMACS -batch -l conftest.el]) +AS_IF([test $ac_status -eq 0], [$2], [$3])]) # AX_CHECK_EMACS_LIB(LIBRARY, ACTION-IF-PRESENT, ACTION-IF-NOT) # ------------------------------------------------------------- |
|
From: Magnus H. <leg...@us...> - 2008-04-20 11:44:13
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1510 Modified Files: jabber.el configure.ac Makefile.am Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-480 Creator: Magnus Henoch <ma...@fr...> Check for presence of elisp libraries, and include them if missing. Make it compile with Emacs 21 and 22. Index: configure.ac =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- configure.ac 20 Apr 2008 06:21:42 -0000 1.1 +++ configure.ac 20 Apr 2008 11:44:07 -0000 1.2 @@ -1,7 +1,15 @@ AC_INIT([jabber.el], [0.8.0], [ema...@li...], [emacs-jabber]) AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-zip]) +AC_CONFIG_MACRO_DIR([m4]) + AM_PATH_LISPDIR -AC_CONFIG_FILES([Makefile tests/Makefile]) +AX_CHECK_EMACS_LIB([sha1], [HAVE_SHA1=yes], [HAVE_SHA1=no]) +AX_CHECK_EMACS_LIB([sha1-el], [HAVE_SHA1_EL=yes], [HAVE_SHA1_EL=no]) +AX_CHECK_EMACS_LIB([hex-util], [HAVE_HEX_UTIL=yes], [HAVE_HEX_UTIL=no]) +AM_CONDITIONAL([USE_OUR_SHA1], [test x$HAVE_SHA1 = xno -a x$HAVE_SHA1_EL = xno]) +AM_CONDITIONAL([USE_OUR_HEX_UTIL], [test x$HAVE_HEX_UTIL = xno]) + +AC_CONFIG_FILES([Makefile tests/Makefile]) AC_OUTPUT Index: Makefile.am =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 20 Apr 2008 06:21:42 -0000 1.1 +++ Makefile.am 20 Apr 2008 11:44:07 -0000 1.2 @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + 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 \ @@ -17,7 +19,15 @@ 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 +compat_lisp_sources = +if USE_OUR_SHA1 +compat_lisp_sources += compat/sha1.el +endif +if USE_OUR_HEX_UTIL +compat_lisp_sources += compat/hex-util.el +endif + +dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoload.el MAINTAINERCLEANFILES=jabber-autoload.el # The autoload file will cause Lisp sources to be rebuilt _twice_: the Index: jabber.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- jabber.el 20 Apr 2008 06:21:41 -0000 1.83 +++ jabber.el 20 Apr 2008 11:44:07 -0000 1.84 @@ -152,7 +152,7 @@ (require 'jabber-wmii) (require 'jabber-osd) -(require 'jabber-autoload) +(load "jabber-autoload") (defvar *jabber-current-status* nil |
|
From: Magnus H. <leg...@us...> - 2008-04-20 11:44:13
|
Update of /cvsroot/emacs-jabber/emacs-jabber/compat In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1510/compat Added Files: sha1.el hex-util.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-480 Creator: Magnus Henoch <ma...@fr...> Check for presence of elisp libraries, and include them if missing. Make it compile with Emacs 21 and 22. --- NEW FILE: hex-util.el --- ;;; hex-util.el --- Functions to encode/decode hexadecimal string. ;; Copyright (C) 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI <sh...@aq...> ;; Keywords: data ;; This file is part of FLIM (Faithful Library about Internet Message). ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as ;; published by the Free Software Foundation; either version 3, or ;; (at your option) any later version. ;; This program is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;;; Code: (eval-when-compile (defmacro hex-char-to-num (chr) `(let ((chr ,chr)) (cond ((and (<= ?a chr)(<= chr ?f)) (+ (- chr ?a) 10)) ((and (<= ?A chr)(<= chr ?F)) (+ (- chr ?A) 10)) ((and (<= ?0 chr)(<= chr ?9)) (- chr ?0)) (t (error "Invalid hexadecimal digit `%c'" chr))))) (defmacro num-to-hex-char (num) `(aref "0123456789abcdef" ,num))) (defun decode-hex-string (string) "Decode hexadecimal STRING to octet string." (let* ((len (length string)) (dst (make-string (/ len 2) 0)) (idx 0)(pos 0)) (while (< pos len) ;; logior and lsh are not byte-coded. ;; (aset dst idx (logior (lsh (hex-char-to-num (aref string pos)) 4) ;; (hex-char-to-num (aref string (1+ pos))))) (aset dst idx (+ (* (hex-char-to-num (aref string pos)) 16) (hex-char-to-num (aref string (1+ pos))))) (setq idx (1+ idx) pos (+ 2 pos))) dst)) (defun encode-hex-string (string) "Encode octet STRING to hexadecimal string." (let* ((len (length string)) (dst (make-string (* len 2) 0)) (idx 0)(pos 0)) (while (< pos len) ;; logand and lsh are not byte-coded. ;; (aset dst idx (num-to-hex-char (logand (lsh (aref string pos) -4) 15))) (aset dst idx (num-to-hex-char (/ (aref string pos) 16))) (setq idx (1+ idx)) ;; (aset dst idx (num-to-hex-char (logand (aref string pos) 15))) (aset dst idx (num-to-hex-char (% (aref string pos) 16))) (setq idx (1+ idx) pos (1+ pos))) dst)) (provide 'hex-util) ;; arch-tag: fe8aaa79-6c86-400e-813f-5a8cc4cb3859 ;;; hex-util.el ends here --- NEW FILE: sha1.el --- ;;; sha1.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp ;; Copyright (C) 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI <sh...@aq...> ;; Keywords: SHA1, FIPS 180-1 ;; This file is part of FLIM (Faithful Library about Internet Message). ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as ;; published by the Free Software Foundation; either version 3, or ;; (at your option) any later version. ;; This program is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; This program is implemented from the definition of SHA-1 in FIPS PUB ;; 180-1 (Federal Information Processing Standards Publication 180-1), ;; "Announcing the Standard for SECURE HASH STANDARD". ;; <URL:http://www.itl.nist.gov/div897/pubs/fip180-1.htm> ;; (EXCEPTION; two optimizations taken from GnuPG/cipher/sha1.c) ;; ;; Test cases from FIPS PUB 180-1. ;; ;; (sha1 "abc") ;; => a9993e364706816aba3e25717850c26c9cd0d89d ;; ;; (sha1 "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") ;; => 84983e441c3bd26ebaae4aa1f95129e5e54670f1 ;; ;; (sha1 (make-string 1000000 ?a)) ;; => 34aa973cd4c4daa4f61eeb2bdbad27316534016f ;; ;; BUGS: ;; * It is assumed that length of input string is less than 2^29 bytes. ;; * It is caller's responsibility to make string (or region) unibyte. ;; ;; TODO: ;; * Rewrite from scratch! ;; This version is much faster than Keiichi Suzuki's another sha1.el, ;; but it is too dirty. ;;; Code: (require 'hex-util) ;;; ;;; external SHA1 function. ;;; (defgroup sha1 nil "Elisp interface for SHA1 hash computation." :version "22.1" :group 'extensions) (defcustom sha1-maximum-internal-length 500 "*Maximum length of message to use Lisp version of SHA1 function. If message is longer than this, `sha1-program' is used instead. If this variable is set to 0, use external program only. If this variable is set to nil, use internal function only." :type 'integer :group 'sha1) (defcustom sha1-program '("sha1sum") "*Name of program to compute SHA1. It must be a string \(program name\) or list of strings \(name and its args\)." :type '(repeat string) :group 'sha1) (defcustom sha1-use-external (condition-case () (executable-find (car sha1-program)) (error)) "*Use external SHA1 program. If this variable is set to nil, use internal function only." :type 'boolean :group 'sha1) (defun sha1-string-external (string &optional binary) (let (prog args digest default-enable-multibyte-characters) (if (consp sha1-program) (setq prog (car sha1-program) args (cdr sha1-program)) (setq prog sha1-program args nil)) (with-temp-buffer (insert string) (apply (function call-process-region) (point-min)(point-max) prog t t nil args) ;; SHA1 is 40 bytes long in hexadecimal form. (setq digest (buffer-substring (point-min)(+ (point-min) 40)))) (if binary (decode-hex-string digest) digest))) (defun sha1-region-external (beg end &optional binary) (sha1-string-external (buffer-substring-no-properties beg end) binary)) ;;; ;;; internal SHA1 function. ;;; (eval-when-compile ;; optional second arg of string-to-number is new in v20. (defconst sha1-K0-high 23170) ; (string-to-number "5A82" 16) (defconst sha1-K0-low 31129) ; (string-to-number "7999" 16) (defconst sha1-K1-high 28377) ; (string-to-number "6ED9" 16) (defconst sha1-K1-low 60321) ; (string-to-number "EBA1" 16) (defconst sha1-K2-high 36635) ; (string-to-number "8F1B" 16) (defconst sha1-K2-low 48348) ; (string-to-number "BCDC" 16) (defconst sha1-K3-high 51810) ; (string-to-number "CA62" 16) (defconst sha1-K3-low 49622) ; (string-to-number "C1D6" 16) ;; original definition of sha1-F0. ;; (defmacro sha1-F0 (B C D) ;; (` (logior (logand (, B) (, C)) ;; (logand (lognot (, B)) (, D))))) ;; a little optimization from GnuPG/cipher/sha1.c. (defmacro sha1-F0 (B C D) `(logxor ,D (logand ,B (logxor ,C ,D)))) (defmacro sha1-F1 (B C D) `(logxor ,B ,C ,D)) ;; original definition of sha1-F2. ;; (defmacro sha1-F2 (B C D) ;; (` (logior (logand (, B) (, C)) ;; (logand (, B) (, D)) ;; (logand (, C) (, D))))) ;; a little optimization from GnuPG/cipher/sha1.c. (defmacro sha1-F2 (B C D) `(logior (logand ,B ,C) (logand ,D (logior ,B ,C)))) (defmacro sha1-F3 (B C D) `(logxor ,B ,C ,D)) (defmacro sha1-S1 (W-high W-low) `(let ((W-high ,W-high) (W-low ,W-low)) (setq S1W-high (+ (% (* W-high 2) 65536) (/ W-low ,(/ 65536 2)))) (setq S1W-low (+ (/ W-high ,(/ 65536 2)) (% (* W-low 2) 65536))))) (defmacro sha1-S5 (A-high A-low) `(progn (setq S5A-high (+ (% (* ,A-high 32) 65536) (/ ,A-low ,(/ 65536 32)))) (setq S5A-low (+ (/ ,A-high ,(/ 65536 32)) (% (* ,A-low 32) 65536))))) (defmacro sha1-S30 (B-high B-low) `(progn (setq S30B-high (+ (/ ,B-high 4) (* (% ,B-low 4) ,(/ 65536 4)))) (setq S30B-low (+ (/ ,B-low 4) (* (% ,B-high 4) ,(/ 65536 4)))))) (defmacro sha1-OP (round) `(progn (sha1-S5 sha1-A-high sha1-A-low) (sha1-S30 sha1-B-high sha1-B-low) (setq sha1-A-low (+ (,(intern (format "sha1-F%d" round)) sha1-B-low sha1-C-low sha1-D-low) sha1-E-low ,(symbol-value (intern (format "sha1-K%d-low" round))) (aref block-low idx) (progn (setq sha1-E-low sha1-D-low) (setq sha1-D-low sha1-C-low) (setq sha1-C-low S30B-low) (setq sha1-B-low sha1-A-low) S5A-low))) (setq carry (/ sha1-A-low 65536)) (setq sha1-A-low (% sha1-A-low 65536)) (setq sha1-A-high (% (+ (,(intern (format "sha1-F%d" round)) sha1-B-high sha1-C-high sha1-D-high) sha1-E-high ,(symbol-value (intern (format "sha1-K%d-high" round))) (aref block-high idx) (progn (setq sha1-E-high sha1-D-high) (setq sha1-D-high sha1-C-high) (setq sha1-C-high S30B-high) (setq sha1-B-high sha1-A-high) S5A-high) carry) 65536)))) (defmacro sha1-add-to-H (H X) `(progn (setq ,(intern (format "sha1-%s-low" H)) (+ ,(intern (format "sha1-%s-low" H)) ,(intern (format "sha1-%s-low" X)))) (setq carry (/ ,(intern (format "sha1-%s-low" H)) 65536)) (setq ,(intern (format "sha1-%s-low" H)) (% ,(intern (format "sha1-%s-low" H)) 65536)) (setq ,(intern (format "sha1-%s-high" H)) (% (+ ,(intern (format "sha1-%s-high" H)) ,(intern (format "sha1-%s-high" X)) carry) 65536)))) ) ;;; buffers (H0 H1 H2 H3 H4). (defvar sha1-H0-high) (defvar sha1-H0-low) (defvar sha1-H1-high) (defvar sha1-H1-low) (defvar sha1-H2-high) (defvar sha1-H2-low) (defvar sha1-H3-high) (defvar sha1-H3-low) (defvar sha1-H4-high) (defvar sha1-H4-low) (defun sha1-block (block-high block-low) (let (;; step (c) --- initialize buffers (A B C D E). (sha1-A-high sha1-H0-high) (sha1-A-low sha1-H0-low) (sha1-B-high sha1-H1-high) (sha1-B-low sha1-H1-low) (sha1-C-high sha1-H2-high) (sha1-C-low sha1-H2-low) (sha1-D-high sha1-H3-high) (sha1-D-low sha1-H3-low) (sha1-E-high sha1-H4-high) (sha1-E-low sha1-H4-low) (idx 16)) ;; step (b). (let (;; temporary variables used in sha1-S1 macro. S1W-high S1W-low) (while (< idx 80) (sha1-S1 (logxor (aref block-high (- idx 3)) (aref block-high (- idx 8)) (aref block-high (- idx 14)) (aref block-high (- idx 16))) (logxor (aref block-low (- idx 3)) (aref block-low (- idx 8)) (aref block-low (- idx 14)) (aref block-low (- idx 16)))) (aset block-high idx S1W-high) (aset block-low idx S1W-low) (setq idx (1+ idx)))) ;; step (d). (setq idx 0) (let (;; temporary variables used in sha1-OP macro. S5A-high S5A-low S30B-high S30B-low carry) (while (< idx 20) (sha1-OP 0) (setq idx (1+ idx))) (while (< idx 40) (sha1-OP 1) (setq idx (1+ idx))) (while (< idx 60) (sha1-OP 2) (setq idx (1+ idx))) (while (< idx 80) (sha1-OP 3) (setq idx (1+ idx)))) ;; step (e). (let (;; temporary variables used in sha1-add-to-H macro. carry) (sha1-add-to-H H0 A) (sha1-add-to-H H1 B) (sha1-add-to-H H2 C) (sha1-add-to-H H3 D) (sha1-add-to-H H4 E)))) (defun sha1-binary (string) "Return the SHA1 of STRING in binary form." (let (;; prepare buffers for a block. byte-length of block is 64. ;; input block is split into two vectors. ;; ;; input block: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F ... ;; block-high: +-0-+ +-1-+ +-2-+ +-3-+ ;; block-low: +-0-+ +-1-+ +-2-+ +-3-+ ;; ;; length of each vector is 80, and elements of each vector are ;; 16bit integers. elements 0x10-0x4F of each vector are ;; assigned later in `sha1-block'. (block-high (eval-when-compile (make-vector 80 nil))) (block-low (eval-when-compile (make-vector 80 nil)))) (unwind-protect (let* (;; byte-length of input string. (len (length string)) (lim (* (/ len 64) 64)) (rem (% len 4)) (idx 0)(pos 0)) ;; initialize buffers (H0 H1 H2 H3 H4). (setq sha1-H0-high 26437 ; (string-to-number "6745" 16) sha1-H0-low 8961 ; (string-to-number "2301" 16) sha1-H1-high 61389 ; (string-to-number "EFCD" 16) sha1-H1-low 43913 ; (string-to-number "AB89" 16) sha1-H2-high 39098 ; (string-to-number "98BA" 16) sha1-H2-low 56574 ; (string-to-number "DCFE" 16) sha1-H3-high 4146 ; (string-to-number "1032" 16) sha1-H3-low 21622 ; (string-to-number "5476" 16) sha1-H4-high 50130 ; (string-to-number "C3D2" 16) sha1-H4-low 57840) ; (string-to-number "E1F0" 16) ;; loop for each 64 bytes block. (while (< pos lim) ;; step (a). (setq idx 0) (while (< idx 16) (aset block-high idx (+ (* (aref string pos) 256) (aref string (1+ pos)))) (setq pos (+ pos 2)) (aset block-low idx (+ (* (aref string pos) 256) (aref string (1+ pos)))) (setq pos (+ pos 2)) (setq idx (1+ idx))) (sha1-block block-high block-low)) ;; last block. (if (prog1 (< (- len lim) 56) (setq lim (- len rem)) (setq idx 0) (while (< pos lim) (aset block-high idx (+ (* (aref string pos) 256) (aref string (1+ pos)))) (setq pos (+ pos 2)) (aset block-low idx (+ (* (aref string pos) 256) (aref string (1+ pos)))) (setq pos (+ pos 2)) (setq idx (1+ idx))) ;; this is the last (at most) 32bit word. (cond ((= rem 3) (aset block-high idx (+ (* (aref string pos) 256) (aref string (1+ pos)))) (setq pos (+ pos 2)) (aset block-low idx (+ (* (aref string pos) 256) 128))) ((= rem 2) (aset block-high idx (+ (* (aref string pos) 256) (aref string (1+ pos)))) (aset block-low idx 32768)) ((= rem 1) (aset block-high idx (+ (* (aref string pos) 256) 128)) (aset block-low idx 0)) (t ;; (= rem 0) (aset block-high idx 32768) (aset block-low idx 0))) (setq idx (1+ idx)) (while (< idx 16) (aset block-high idx 0) (aset block-low idx 0) (setq idx (1+ idx)))) ;; last block has enough room to write the length of string. (progn ;; write bit length of string to last 4 bytes of the block. (aset block-low 15 (* (% len 8192) 8)) (setq len (/ len 8192)) (aset block-high 15 (% len 65536)) ;; XXX: It is not practical to compute SHA1 of ;; such a huge message on emacs. ;; (setq len (/ len 65536)) ; for 64bit emacs. ;; (aset block-low 14 (% len 65536)) ;; (aset block-high 14 (/ len 65536)) (sha1-block block-high block-low)) ;; need one more block. (sha1-block block-high block-low) (fillarray block-high 0) (fillarray block-low 0) ;; write bit length of string to last 4 bytes of the block. (aset block-low 15 (* (% len 8192) 8)) (setq len (/ len 8192)) (aset block-high 15 (% len 65536)) ;; XXX: It is not practical to compute SHA1 of ;; such a huge message on emacs. ;; (setq len (/ len 65536)) ; for 64bit emacs. ;; (aset block-low 14 (% len 65536)) ;; (aset block-high 14 (/ len 65536)) (sha1-block block-high block-low)) ;; make output string (in binary form). (let ((result (make-string 20 0))) (aset result 0 (/ sha1-H0-high 256)) (aset result 1 (% sha1-H0-high 256)) (aset result 2 (/ sha1-H0-low 256)) (aset result 3 (% sha1-H0-low 256)) (aset result 4 (/ sha1-H1-high 256)) (aset result 5 (% sha1-H1-high 256)) (aset result 6 (/ sha1-H1-low 256)) (aset result 7 (% sha1-H1-low 256)) (aset result 8 (/ sha1-H2-high 256)) (aset result 9 (% sha1-H2-high 256)) (aset result 10 (/ sha1-H2-low 256)) (aset result 11 (% sha1-H2-low 256)) (aset result 12 (/ sha1-H3-high 256)) (aset result 13 (% sha1-H3-high 256)) (aset result 14 (/ sha1-H3-low 256)) (aset result 15 (% sha1-H3-low 256)) (aset result 16 (/ sha1-H4-high 256)) (aset result 17 (% sha1-H4-high 256)) (aset result 18 (/ sha1-H4-low 256)) (aset result 19 (% sha1-H4-low 256)) result)) ;; do not leave a copy of input string. (fillarray block-high nil) (fillarray block-low nil)))) (defun sha1-string-internal (string &optional binary) (if binary (sha1-binary string) (encode-hex-string (sha1-binary string)))) (defun sha1-region-internal (beg end &optional binary) (sha1-string-internal (buffer-substring-no-properties beg end) binary)) ;;; ;;; application interface. ;;; (defun sha1-region (beg end &optional binary) (if (and sha1-use-external sha1-maximum-internal-length (> (abs (- end beg)) sha1-maximum-internal-length)) (sha1-region-external beg end binary) (sha1-region-internal beg end binary))) (defun sha1-string (string &optional binary) (if (and sha1-use-external sha1-maximum-internal-length (> (length string) sha1-maximum-internal-length)) (sha1-string-external string binary) (sha1-string-internal string binary))) ;;;###autoload (defun sha1 (object &optional beg end binary) "Return the SHA1 (Secure Hash Algorithm) of an object. OBJECT is either a string or a buffer. Optional arguments BEG and END denote buffer positions for computing the hash of a portion of OBJECT. If BINARY is non-nil, return a string in binary form." (if (stringp object) (sha1-string object binary) (with-current-buffer object (sha1-region (or beg (point-min)) (or end (point-max)) binary)))) (provide 'sha1) ;; arch-tag: c0f9abd0-ffc1-4557-aac6-ece7f2d4c901 ;;; sha1.el ends here |
|
From: Magnus H. <leg...@us...> - 2008-04-20 11:44:11
|
Update of /cvsroot/emacs-jabber/emacs-jabber/m4 In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1510/m4 Added Files: emacs-lib.m4 Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-480 Creator: Magnus Henoch <ma...@fr...> Check for presence of elisp libraries, and include them if missing. Make it compile with Emacs 21 and 22. --- NEW FILE: emacs-lib.m4 --- # AX_EMACS_RUN_IFELSE(PROGRAM, ACTION-IF-TRUE, ACTION-IF-FALSE) # ------------------------------------------------------------- # Run PROGRAM in emacs. If it finishes successfully, execute # ACTION-IF-TRUE, else ACTION-IF-FALSE. AC_DEFUN([AX_EMACS_RUN_IFELSE], [cat >conftest.el <<EOF $1 EOF AS_IF([$EMACS -batch -l conftest.el >/dev/null 2>&1], [$2], [$3])]) # AX_CHECK_EMACS_LIB(LIBRARY, ACTION-IF-PRESENT, ACTION-IF-NOT) # ------------------------------------------------------------- # Check whether emacs can load LIBRARY with require. Execute # ACTION-IF-PRESENT if it can, else ACTION-IF-NOT. AC_DEFUN([AX_CHECK_EMACS_LIB], [ AC_CACHE_CHECK([whether $EMACS has library $1], [AS_TR_SH([ax_cv_emacs_lib_$1])], [AX_EMACS_RUN_IFELSE([(require '$1)], [AS_TR_SH([ax_cv_emacs_lib_$1])=yes], [AS_TR_SH([ax_cv_emacs_lib_$1])=no])]) AS_IF([test $AS_TR_SH([ax_cv_emacs_lib_$1]) = yes], [$2], [$3]) ]) |
|
From: Magnus H. <leg...@us...> - 2008-04-20 11:43:57
|
Update of /cvsroot/emacs-jabber/emacs-jabber/m4 In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1116/m4 Log Message: Directory /cvsroot/emacs-jabber/emacs-jabber/m4 added to the repository |
|
From: Magnus H. <leg...@us...> - 2008-04-20 11:43:46
|
Update of /cvsroot/emacs-jabber/emacs-jabber/compat In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1087/compat Log Message: Directory /cvsroot/emacs-jabber/emacs-jabber/compat added to the repository |
|
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 |
|
From: Magnus H. <leg...@us...> - 2008-04-20 06:21:53
|
Update of /cvsroot/emacs-jabber/emacs-jabber/tests In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv2509/tests Added Files: skip-tag-forward.el 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 --- NEW FILE: skip-tag-forward.el --- ;; Tests for jabber-xml-skip-tag-forward (require 'jabber-xml) (require 'cl) (flet ((parses-p (text) (with-temp-buffer (insert text) (goto-char (point-min)) (catch 'unfinished (jabber-xml-skip-tag-forward) (= (point) (point-max)))))) ;; 1. Just plain XML (unless (parses-p "<stream:features><starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>ANONYMOUS</mechanism><mechanism>DIGEST-MD5</mechanism><mechanism>PLAIN</mechanism></mechanisms><register xmlns='http://jabber.org/features/iq-register'/></stream:features>") (error "Testcase 1 failed")) ;; 2. XML with CDATA (unless (parses-p "<message><body><![CDATA[<foo & bar>]]></body></message>") (error "Testcase 2 failed"))) ;; arch-tag: a99d8666-0e6b-11dd-bd33-000a95c2fcd0 --- NEW FILE: Makefile.am --- TESTS_ENVIRONMENT = $(EMACS) -batch -L $(top_builddir) -l TESTS = skip-tag-forward.el dist_noinst_DATA = $(TESTS) |
|
From: Magnus H. <leg...@us...> - 2008-04-20 06:21:24
|
Update of /cvsroot/emacs-jabber/emacs-jabber/tests In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv2465/tests Log Message: Directory /cvsroot/emacs-jabber/emacs-jabber/tests added to the repository |
|
From: Magnus H. <leg...@us...> - 2008-04-19 22:55:55
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17355 Modified Files: jabber-xml.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-478 Creator: Magnus Henoch <ma...@fr...> jabber-xml-skip-tag-forward: Handle CDATA sections Index: jabber-xml.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-xml.el,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- jabber-xml.el 21 Nov 2007 12:48:01 -0000 1.21 +++ jabber-xml.el 19 Apr 2008 22:55:48 -0000 1.22 @@ -1,6 +1,6 @@ ;; jabber-xml.el - XML functions -;; 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. @@ -102,8 +102,12 @@ The version of `sgml-skip-tag-forward' in Emacs 21 isn't good enough for us." (skip-chars-forward "^<") - (if (not (looking-at "<\\([^ \t\n/>]+\\)\\([ \t\n]+[^=]+='[^']*'\\|[ \t\n]+[^=]+=\"[^\"]*\"\\)*")) - (throw 'unfinished nil) + (cond + ((looking-at "<!\\[CDATA\\[") + (if (search-forward "]]>" nil t) + (goto-char (match-end 0)) + (throw 'unfinished nil))) + ((looking-at "<\\([^ \t\n/>]+\\)\\([ \t\n]+[^=]+='[^']*'\\|[ \t\n]+[^=]+=\"[^\"]*\"\\)*") (let ((node-name (match-string 1))) (goto-char (match-end 0)) (cond @@ -119,7 +123,9 @@ (goto-char (match-end 0)) t) (t - (throw 'unfinished nil)))))) + (throw 'unfinished nil))))) + (t + (throw 'unfinished nil)))) (defsubst jabber-xml-node-name (node) "Return the tag associated with NODE. |
|
From: Evgenii T. <evg...@us...> - 2008-04-15 13:47:46
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29398 Modified Files: jabber-muc-nick-completion.el Log Message: Fix for MUC topic changing (possibly others muc messages without text) Index: jabber-muc-nick-completion.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc-nick-completion.el,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- jabber-muc-nick-completion.el 26 Mar 2008 16:48:07 -0000 1.9 +++ jabber-muc-nick-completion.el 15 Apr 2008 13:47:27 -0000 1.10 @@ -71,11 +71,12 @@ (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." - (string-match (concat + (if message (string-match (concat "^" (jabber-my-nick group) (regexp-opt jabber-muc-looks-personaling-symbols)) - message)) + message) + nil)) (defun jabber-muc-nicknames () "List of conference participants, excluding self, or nil if we not in conference." |
|
From: Magnus H. <leg...@us...> - 2008-03-30 18:39:41
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26626 Modified Files: jabber-autoaway.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-476 Creator: Magnus Henoch <ma...@fr...> Fix previous fix Index: jabber-autoaway.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-autoaway.el,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- jabber-autoaway.el 30 Mar 2008 18:31:53 -0000 1.6 +++ jabber-autoaway.el 30 Mar 2008 18:39:35 -0000 1.7 @@ -149,6 +149,7 @@ (if (string= *jabber-current-status* jabber-autoaway-status) (jabber-send-default-presence) (jabber-autoaway-message "%S /= %S - not resetting presence" *jabber-current-status* jabber-autoaway-status)) + (jabber-autoaway-stop) (jabber-autoaway-start)))) (defun jabber-xprintidle-get-idle-time () |
|
From: Magnus H. <leg...@us...> - 2008-03-30 18:32:00
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23353 Modified Files: jabber-autoaway.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-475 Creator: Magnus Henoch <ma...@fr...> Fix autoaway WRT recent presence fix Index: jabber-autoaway.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-autoaway.el,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- jabber-autoaway.el 13 Mar 2007 20:02:46 -0000 1.5 +++ jabber-autoaway.el 30 Mar 2008 18:31:53 -0000 1.6 @@ -1,6 +1,6 @@ ;;; jabber-autoaway.el --- change status to away after idleness -;; Copyright (C) 2006 Magnus Henoch +;; Copyright (C) 2006, 2008 Magnus Henoch ;; Author: Magnus Henoch <ma...@fr...> @@ -90,11 +90,10 @@ The IGNORED argument is there so you can put this function in `jabber-post-connect-hooks'." (interactive) - (when jabber-autoaway-timer - (jabber-cancel-timer jabber-autoaway-timer)) - (setq jabber-autoaway-timer - (run-with-timer (* jabber-autoaway-timeout 60) nil #'jabber-autoaway-timer)) - (jabber-autoaway-message "Autoaway timer started")) + (unless jabber-autoaway-timer + (setq jabber-autoaway-timer + (run-with-timer (* jabber-autoaway-timeout 60) nil #'jabber-autoaway-timer)) + (jabber-autoaway-message "Autoaway timer started"))) (defun jabber-autoaway-stop () "Stop autoaway timer." @@ -145,9 +144,11 @@ (progn (setq jabber-autoaway-last-idle-time idle-time)) ;; But if it doesn't, go back to unidle state. + (jabber-autoaway-message "Back to unidle") ;; But don't mess with the user's custom presence. - (when (string= *jabber-current-status* jabber-autoaway-status) - (jabber-send-default-presence)) + (if (string= *jabber-current-status* jabber-autoaway-status) + (jabber-send-default-presence) + (jabber-autoaway-message "%S /= %S - not resetting presence" *jabber-current-status* jabber-autoaway-status)) (jabber-autoaway-start)))) (defun jabber-xprintidle-get-idle-time () |
|
From: Magnus H. <leg...@us...> - 2008-03-28 13:46:32
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20742 Modified Files: jabber-core.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-474 Creator: Magnus Henoch <ma...@fr...> jabber-send-string: signal an error if connection is nil Index: jabber-core.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- jabber-core.el 27 Mar 2008 16:09:13 -0000 1.87 +++ jabber-core.el 28 Mar 2008 13:46:23 -0000 1.88 @@ -989,6 +989,8 @@ (let* ((state-data (fsm-get-state-data jc)) (connection (plist-get state-data :connection)) (send-function (plist-get state-data :send-function))) + (unless connection + (error "%s has no connection" (jabber-connection-jid jc))) (funcall send-function connection string))) (provide 'jabber-core) |
|
From: Magnus H. <leg...@us...> - 2008-03-27 16:09:25
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24386 Modified Files: jabber.el jabber-core.el jabber-presence.el Log Message: Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-473 Creator: Magnus Henoch <ma...@fr...> Don't reset presence when new account connects Connecting a new account used to call jabber-send-default-presence, which resets any custom presence sent (including autoaway). Now jabber-send-current-presence is used instead. Fixes bug #1870437. Index: jabber-core.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- jabber-core.el 5 Mar 2008 12:05:49 -0000 1.86 +++ jabber-core.el 27 Mar 2008 16:09:13 -0000 1.87 @@ -66,7 +66,7 @@ (defgroup jabber-core nil "customize core functionality" :group 'jabber) -(defcustom jabber-post-connect-hooks '(jabber-send-default-presence +(defcustom jabber-post-connect-hooks '(jabber-send-current-presence jabber-muc-autojoin) "*Hooks run after successful connection and authentication. The functions should accept one argument, the connection object." Index: jabber.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- jabber.el 3 Feb 2008 05:50:32 -0000 1.81 +++ jabber.el 27 Mar 2008 16:09:13 -0000 1.82 @@ -1,6 +1,6 @@ ;; jabber.el - a minimal jabber client -;; 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... ;; SSL - Support, mostly inspired by Gnus @@ -182,13 +182,13 @@ result as arguments." nil) -(defvar *jabber-current-status* "" +(defvar *jabber-current-status* nil "the users current presence staus") -(defvar *jabber-current-show* "" +(defvar *jabber-current-show* nil "the users current presence show") -(defvar *jabber-current-priority* 10 +(defvar *jabber-current-priority* nil "the user's current priority") (defvar *jabber-status-history* nil Index: jabber-presence.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-presence.el,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- jabber-presence.el 4 Mar 2008 07:23:27 -0000 1.46 +++ jabber-presence.el 27 Mar 2008 16:09:13 -0000 1.47 @@ -411,6 +411,17 @@ ;; jabber-post-connect-hooks. (jabber-send-presence jabber-default-show jabber-default-status jabber-default-priority)) +(defun jabber-send-current-presence (&optional jc) + "(Re-)send current presence. +That is, if presence has already been sent, use current settings, +else send defaults (see `jabber-send-default-presence')." + (interactive) + ;; jc is ignored. It's only there so this function can be in + ;; jabber-post-connect-hooks. + (if *jabber-current-show* + (jabber-send-presence *jabber-current-show* *jabber-current-status* *jabber-current-priority*) + (jabber-send-default-presence))) + (add-to-list 'jabber-jid-roster-menu (cons "Send subscription request" 'jabber-send-subscription-request)) (defun jabber-send-subscription-request (jc to &optional request) |
|
From: Evgenii T. <evg...@us...> - 2008-03-26 16:48:13
|
Update of /cvsroot/emacs-jabber/emacs-jabber In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31879 Modified Files: jabber-muc-nick-completion.el Log Message: Complex (regexp-like) nicks handing fixed. Index: jabber-muc-nick-completion.el =================================================================== RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc-nick-completion.el,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- jabber-muc-nick-completion.el 5 Mar 2008 14:31:10 -0000 1.8 +++ jabber-muc-nick-completion.el 26 Mar 2008 16:48:07 -0000 1.9 @@ -169,8 +169,8 @@ (jabber-muc-completion-delete-last-tried) (progn (insert subst) - (if (looking-back (concat "^" (car he-expand-list))) - (unless (looking-back (concat "^" (car he-expand-list) jabber-muc-completion-delimiter)) + (if (looking-back (concat "^" (regexp-quote (car he-expand-list)))) + (unless (looking-back (concat "^" (regexp-quote (car he-expand-list)) jabber-muc-completion-delimiter)) (insert jabber-muc-completion-delimiter))) ) )) |
