emacs-jabber-commit — jabber.el commit messages

emacs-jabber/tests load-all.el,NONE,1.1 Makefile.am,1.2,1.3

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber/tests
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv11629/tests

Modified Files:
	Makefile.am 
Added Files:
	load-all.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-515
Creator:  Magnus Henoch <ma...@fr...>

New test: check that all files can be loaded


--- NEW FILE: load-all.el ---
;; Test that all files can be loaded

(let* ((default-directory (expand-file-name (getenv "top_builddir")))
       (elc-files (file-expand-wildcards "*.elc" t)))
  (dolist (f elc-files)
    (load f nil t)))

;; arch-tag: 509c4808-2e92-11dd-9c8c-000a95c2fcd0

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/tests/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	15 May 2008 23:36:28 -0000	1.2
+++ Makefile.am	30 May 2008 21:57:15 -0000	1.3
@@ -1,3 +1,3 @@
-TESTS_ENVIRONMENT = $(EMACS) -batch -L $(top_builddir) -l
-TESTS = skip-tag-forward.el history.el
+TESTS_ENVIRONMENT = env top_builddir=$(top_builddir) $(EMACS) -batch -L $(top_builddir) -l
+TESTS = load-all.el skip-tag-forward.el history.el
 dist_noinst_DATA = $(TESTS)

emacs-jabber jabber-ourversion.el.in, NONE, 1.1 jabber-version.el, 1.12, 1.13 configure.ac, 1.4, 1.5 Makefile.am, 1.4, 1.5

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv11196

Modified Files:
	jabber-version.el configure.ac Makefile.am 
Added Files:
	jabber-ourversion.el.in 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-514
Creator:  Magnus Henoch <ma...@fr...>

Put jabber-version variable in separate, automatically updated file


Index: jabber-version.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-version.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- jabber-version.el	12 Feb 2007 20:49:25 -0000	1.12
+++ jabber-version.el	30 May 2008 21:56:56 -0000	1.13
@@ -1,7 +1,7 @@
 ;; jabber-version.el - version reporting by JEP-0092
 
+;; Copyright (C) 2003, 2004, 2008 - Magnus Henoch - ma...@fr...
 ;; Copyright (C) 2002, 2003, 2004 - tom berger - ob...@in...
-;; Copyright (C) 2003, 2004 - Magnus Henoch - ma...@fr...
 
 ;; This file is a part of jabber.el.
 
@@ -21,9 +21,7 @@
 
 (require 'jabber-iq)
 (require 'jabber-util)
-
-(defconst jabber-version "0.7.1-dev1"
-  "version returned to those who query us")
+(require 'jabber-ourversion)
 
 (add-to-list 'jabber-jid-info-menu
 	     (cons "Request software version" 'jabber-get-version))

Index: configure.ac
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.ac	25 Apr 2008 18:52:09 -0000	1.4
+++ configure.ac	30 May 2008 21:56:56 -0000	1.5
@@ -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-ourversion.el])
 AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	25 Apr 2008 18:52:09 -0000	1.4
+++ Makefile.am	30 May 2008 21:56:57 -0000	1.5
@@ -27,7 +27,7 @@
 compat_lisp_sources += compat/hex-util.el
 endif
 
-dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el
+dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el jabber-ourversion.el
 MAINTAINERCLEANFILES=jabber-autoloads.el
 
 EXTRA_DIST = jabber-pkg.el.in

--- NEW FILE: jabber-ourversion.el.in ---
;; @configure_input@

;; This value gets updated automatically when configure.ac is changed.
(defconst jabber-version "@PACKAGE_VERSION@"
  "version returned to those who query us")

(provide 'jabber-ourversion)

emacs-jabber jabber-conn.el, 2.12, 2.13 jabber.el, 1.87, 1.88 jabber-core.el, 1.89, 1.90

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6487

Modified Files:
	jabber-conn.el jabber.el jabber-core.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-512
Creator:  Magnus Henoch <ma...@fr...>

Kill process buffers when a process dies, unless wanted for debugging reasons


Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- jabber-core.el	24 Apr 2008 02:19:29 -0000	1.89
+++ jabber-core.el	30 May 2008 20:43:29 -0000	1.90
@@ -255,7 +255,11 @@
   ;; Close the network connection.
   (let ((connection (plist-get state-data :connection)))
     (when (processp connection)
-      (delete-process connection)))
+      (let ((process-buffer (process-buffer connection)))
+	(delete-process connection)
+	(when (and (bufferp process-buffer)
+		   (not jabber-debug-keep-process-buffers))
+	  (kill-buffer process-buffer)))))
   (setq state-data (plist-put state-data :connection nil))
   ;; Remove lost connections from the roster buffer.
   (jabber-display-roster)

Index: jabber.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- jabber.el	24 Apr 2008 02:19:29 -0000	1.87
+++ jabber.el	30 May 2008 20:43:29 -0000	1.88
@@ -194,6 +194,12 @@
   :type 'boolean
   :group 'jabber-debug)
 
+(defcustom jabber-debug-keep-process-buffers nil
+  "If nil, kill process buffers when the process dies.
+Contents of process buffers might be useful for debugging."
+  :type 'boolean
+  :group 'jabber-debug)
+
 (defconst jabber-presence-faces
  '(("" . jabber-roster-user-online)
    ("away" . jabber-roster-user-away)

Index: jabber-conn.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-conn.el,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- jabber-conn.el	17 Sep 2007 12:26:16 -0000	2.12
+++ jabber-conn.el	30 May 2008 20:43:29 -0000	2.13
@@ -123,12 +123,18 @@
     (catch 'connected
       (dolist (target targets)
 	(condition-case e
-	    (let ((connection 
-		   (open-network-stream
-		    "jabber"
-		    (generate-new-buffer jabber-process-buffer)
-		    (car target)
-		    (cdr target))))
+	    (let ((process-buffer (generate-new-buffer jabber-process-buffer))
+		  connection)
+	      (unwind-protect
+		  (setq connection (open-network-stream
+				    "jabber"
+				    process-buffer
+				    (car target)
+				    (cdr target)))
+
+		(unless (or connection jabber-debug-keep-process-buffers)
+		  (kill-buffer process-buffer)))
+	
 	      (when connection
 		(fsm-send fsm (list :connected connection))
 		(throw 'connected connection)))
@@ -161,12 +167,16 @@
 	   'open-ssl-stream)
 	  (t
 	   (error "Neither TLS nor SSL connect functions available")))))
-    (let ((connection
-	   (funcall connect-function
-		    "jabber"
-		    (generate-new-buffer jabber-process-buffer)
-		    (or network-server server)
-		    (or port 5223))))
+    (let ((process-buffer (generate-new-buffer jabber-process-buffer))
+	  connection)
+      (unwind-protect
+	  (setq connection (funcall connect-function
+				    "jabber"
+				    process-buffer
+				    (or network-server server)
+				    (or port 5223)))
+	(unless (or connection jabber-debug-keep-process-buffers)
+	  (kill-buffer process-buffer)))
       (if connection
 	  (fsm-send fsm (list :connected connection))
 	(fsm-send fsm :connection-failed)))))
@@ -190,12 +200,17 @@
     (catch 'connected
       (dolist (target targets)
 	(condition-case e
-	    (let ((connection
-		   (starttls-open-stream
-		    "jabber"
-		    (generate-new-buffer jabber-process-buffer)
-		    (car target)
-		    (cdr target))))
+	    (let ((process-buffer (generate-new-buffer jabber-process-buffer))
+		  connection)
+	      (unwind-protect
+		  (setq connection
+			(starttls-open-stream
+			 "jabber"
+			 process-buffer
+			 (car target)
+			 (cdr target)))
+		(unless (or connection jabber-debug-keep-process-buffers)
+		  (kill-buffer process-buffer)))
 	      (when connection
 		(fsm-send fsm (list :connected connection))
 		(throw 'connected connection)))

emacs-jabber jabber-vcard-avatars.el,1.11,1.12

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6438

Modified Files:
	jabber-vcard-avatars.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-511
Creator:  Magnus Henoch <ma...@fr...>

Fix interactive use of jabber-vcard-avatars-fetch


Index: jabber-vcard-avatars.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-vcard-avatars.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jabber-vcard-avatars.el	27 May 2008 01:12:21 -0000	1.11
+++ jabber-vcard-avatars.el	30 May 2008 20:43:14 -0000	1.12
@@ -69,7 +69,8 @@
 (defun jabber-vcard-avatars-fetch (jc who sha1-hash)
   "Fetch WHO's vCard, and extract avatar."
   (interactive (list (jabber-read-account)
-		     (jabber-read-jid-completing "Fetch whose vCard avatar: ")))
+		     (jabber-read-jid-completing "Fetch whose vCard avatar: ")
+		     nil))
   (jabber-send-iq jc who "get" '(vCard ((xmlns . "vcard-temp")))
 		  #'jabber-vcard-avatars-vcard (cons who sha1-hash)
 		  #'ignore nil))
@@ -82,7 +83,8 @@
     (if photo
 	(let ((avatar (jabber-avatar-from-base64-string (nth 2 photo)
 							(nth 1 photo))))
-	  (unless (string= sha1-hash (avatar-sha1-sum avatar))
+	  (unless (or (null sha1-hash)
+		      (string= sha1-hash (avatar-sha1-sum avatar)))
 	    (when jabber-avatar-verbose
 	      (message "%s's avatar should have SHA1 sum %s, but has %s"
 		       (jabber-jid-displayname from)

emacs-jabber jabber-vcard-avatars.el,1.10,1.11

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12421

Modified Files:
	jabber-vcard-avatars.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-510
Creator:  Magnus Henoch <ma...@fr...>

Don't fetch avatar from disk if it hasn't changed


Index: jabber-vcard-avatars.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-vcard-avatars.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jabber-vcard-avatars.el	8 Aug 2007 11:59:01 -0000	1.10
+++ jabber-vcard-avatars.el	27 May 2008 01:12:21 -0000	1.11
@@ -1,6 +1,6 @@
 ;;; jabber-vcard-avatars.el --- Avatars by JEP-0153
 
-;; Copyright (C) 2006, 2007  Magnus Henoch
+;; Copyright (C) 2006, 2007, 2008  Magnus Henoch
 
 ;; Author: Magnus Henoch <ma...@fr...>
 
@@ -52,14 +52,19 @@
     (let* ((from (jabber-jid-user (jabber-xml-get-attribute xml-data 'from)))
 	   (photo (jabber-xml-path xml-data '(("vcard-temp:x:update" . "x") photo)))
 	   (sha1-hash (car (jabber-xml-node-children photo))))
-      (if (null sha1-hash)
-	  ;; User has removed avatar
-	  (jabber-avatar-set from nil)
-	(if (jabber-avatar-find-cached sha1-hash)
-	    ;; Avatar is cached
-	    (jabber-avatar-set from sha1-hash)
-	  ;; Avatar is not cached; retrieve it
-	  (jabber-vcard-avatars-fetch jc from sha1-hash))))))
+      (cond
+       ((null sha1-hash)
+	;; User has removed avatar
+	(jabber-avatar-set from nil))
+       ((string= sha1-hash (get (jabber-jid-symbol from) 'avatar-hash))
+	;; Same avatar as before; do nothing
+	)
+       ((jabber-avatar-find-cached sha1-hash)
+	;; Avatar is cached
+	(jabber-avatar-set from sha1-hash))
+       (t
+	;; Avatar is not cached; retrieve it
+	(jabber-vcard-avatars-fetch jc from sha1-hash))))))
 
 (defun jabber-vcard-avatars-fetch (jc who sha1-hash)
   "Fetch WHO's vCard, and extract avatar."

emacs-jabber jabber.texi,1.99,1.100

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7122

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-509
Creator:  Magnus Henoch <ma...@fr...>

Fix node references


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- jabber.texi	18 May 2008 12:14:41 -0000	1.99
+++ jabber.texi	21 May 2008 15:06:58 -0000	1.100
@@ -446,7 +446,7 @@
 groupchat.  This nickname doesn't need to have any correlation to your
 JID; in fact, groupchats are usually (but not always) configured such
 that only moderators can see your JID.  You can change your nickname
-with @kbd{M-x jabber-muc-nick}.  @xref{Automation}, for setting default 
+with @kbd{M-x jabber-muc-nick}.  @xref{Configuration}, for setting default 
 nicknames.
 
 @cindex Query groupchat
@@ -502,14 +502,13 @@
 
 
 @menu
-* Automation::                  
-* Bookmarks::                   
+* Configuration::               
 * Invitations::                 
 * Private messages::            
 * MUC Administration::          
 @end menu
 
-@node Configuration, Bookmarks, Groupchat, Groupchat
+@node Configuration, Invitations, Groupchat, Groupchat
 @section Configuration
 
 @vindex jabber-muc-default-nicknames
@@ -546,7 +545,7 @@
 the same chat rooms, or use the same nickname.  This will lead to
 confusion.
 
-@node Invitations, Private messages, Bookmarks, Groupchat
+@node Invitations, Private messages, Configuration, Groupchat
 @section Invitations
 
 @cindex Invitations

emacs-jabber README,1.23,1.24

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7108

Modified Files:
	README 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-508
Creator:  Magnus Henoch <ma...@fr...>

Add notes about CVS version to README


Index: README
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/README,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- README	18 May 2008 12:12:27 -0000	1.23
+++ README	21 May 2008 15:06:44 -0000	1.24
@@ -75,6 +75,15 @@
 If you are upgrading from 0.7-0.7.x, you need to update your
 configuration.  See the section "Account settings" in the manual.
 
+Special notes for CVS version
+=============================
+If you are running jabber.el from CVS, you need to generate the
+jabber-autoloads.el file yourself.  The simplest way to do this is by
+using the "./configure && make" process.
+
+To generate the configure script, make sure that autoconf and automake
+are installed and run "autoreconf -i".
+
 Usage
 =====
 

emacs-jabber jabber.texi,1.98,1.99

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28591

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-507
Creator:  Magnus Henoch <ma...@fr...>

Documentation: punctuation consistency


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- jabber.texi	18 May 2008 12:14:27 -0000	1.98
+++ jabber.texi	18 May 2008 12:14:41 -0000	1.99
@@ -645,7 +645,7 @@
 grant voice only to members.
 
 @item outcast
-Banned from the room
+Banned from the room.
 @end table
 
 

emacs-jabber jabber.texi,1.97,1.98

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28575

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-506
Creator:  Magnus Henoch <ma...@fr...>

Documentation: space fix


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- jabber.texi	18 May 2008 12:14:12 -0000	1.97
+++ jabber.texi	18 May 2008 12:14:27 -0000	1.98
@@ -554,7 +554,7 @@
 
 You can invite someone to a groupchat with @kbd{M-x jabber-muc-invite}
 (also available in the MUC menu).  Pay attention to the order of the
-arguments --- as both users and rooms are just JIDs, it is technically
+arguments---as both users and rooms are just JIDs, it is technically
 possible to invite a room to a user, but that's probably not what you
 want.
 

emacs-jabber jabber.texi,1.96,1.97

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28550

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-505
Creator:  Magnus Henoch <ma...@fr...>

Documentation: MUC


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- jabber.texi	18 May 2008 12:13:33 -0000	1.96
+++ jabber.texi	18 May 2008 12:14:12 -0000	1.97
@@ -437,14 +437,6 @@
 roster buffer.  You can also type the commands directly, as will be
 shown here.
 
-Also, to save from repeating unnesesary typing you can press @kbd{Tab}
-key to complete nick of groupchat member, you a talking with. You can
-customize your form of personal talking in MUC
-(@code{jabber-muc-completion-delimiter}) and form of personal talking
-to you (@code{jabber-muc-looks-personaling-symbols}) - see
-``jabber-chat'' customization group. Defaults are sane, so unlikely
-you could change this, but... it is Emacs!
-
 @findex jabber-groupchat-join
 @cindex Joining a groupchat
 @cindex Changing nickname
@@ -457,7 +449,7 @@
 with @kbd{M-x jabber-muc-nick}.  @xref{Automation}, for setting default 
 nicknames.
 
-@cindex query groupchat
+@cindex Query groupchat
 @vindex jabber-muc-disable-disco-check
 When trying to join a room, jabber.el first sends a service discovery
 info request to the room, to find out whether it exists and what
@@ -465,12 +457,29 @@
 password-protected).  However, this can cause problems with some buggy
 MUC services (or services that respond in a way that jabber.el doesn't
 expect).  A workaround for that is to set
-@code{jabber-muc-disable-disco-check} to t; however, the bug should be
+@code{jabber-muc-disable-disco-check} to @code{t}; however, the bug should be
 unearthed and fixed.
 
 Groupchat messages will be displayed in a buffer called
-@code{*-jabber-groupchat-:-@var{groupchat}-*}.  It works much like the
-chat buffer.
+@code{*-jabber-groupchat-:-@var{groupchat}-*}.  By default, the buffer
+name is based on the JID of the chat room.  If you want a shorter name,
+you can add the chat room to your roster and give it a name, using the
+command @kbd{M-x jabber-roster-change}.  The groupchat buffer works much
+like the chat buffer.  It has its own class of alerts
+(@pxref{Customizing alerts}), and uses activity tracking
+(@pxref{Tracking activity}).
+
+@vindex jabber-muc-completion-delimiter
+@vindex jabber-muc-looks-personaling-symbols
+@cindex Groupchat completion
+@cindex Nick completion in groupchat
+Also, to save from repeating unnesesary typing you can press @kbd{Tab}
+key to complete nick of a groupchat member that you are talking with.
+You can customize your form of personal talking in MUC
+(@code{jabber-muc-completion-delimiter}) and form of personal talking to
+you (@code{jabber-muc-looks-personaling-symbols})---see ``jabber-chat''
+customization group. Defaults are sane, so it is unlikely that you would
+want to change this, but... it is Emacs!
 
 @cindex Topic, MUC
 @findex jabber-muc-set-topic
@@ -500,40 +509,42 @@
 * MUC Administration::          
 @end menu
 
-@node Automation, Bookmarks, Groupchat, Groupchat
-@section Automation
+@node Configuration, Bookmarks, Groupchat, Groupchat
+@section Configuration
 
 @vindex jabber-muc-default-nicknames
 @vindex jabber-muc-autojoin
 @findex jabber-muc-autojoin
 @cindex Default MUC nickname
 @cindex Autojoin chat rooms
+@cindex Bookmarks, MUC
+@findex jabber-edit-bookmarks
 
-You can select a default nickname by setting
-@code{jabber-account-list} (part of JID before @code{@@}).
-Additionally, you can set different nicknames for different groups, by
-customizing @code{jabber-muc-default-nicknames}.  There you specify
-the JID of the group, and your preferred nickname.
+You can configure jabber.el to use a certain nickname for a certain
+room, or to automatically join a certain room when you connect.  You can
+do this either by storing bookmarks on the server or by setting Emacs
+variables.
 
-If you want to automatically join certain rooms when connecting, you
-can set @code{jabber-muc-autojoin} to a list containing the JIDs of
+Type @kbd{M-x jabber-edit-bookmarks} to add bookmarks.  You can specify
+the JID of the conference, the name of the conference (not used by
+jabber.el), whether to automatically join the room, your desired
+nickname (or leave empty), and the room password (or leave empty).
+
+The default nickname for groupchats is the username part of your JID.
+If you don't use bookmarks, you can set different nicknames for
+different groups by customizing @code{jabber-muc-default-nicknames}.
+There you specify the JID of the group, and your preferred nickname.
+
+Automatically joining certain rooms when connecting can be accomplished
+by setting @code{jabber-muc-autojoin} to a list containing the JIDs of
 the rooms you want to enter.  To disable this feature, remove
 @code{jabber-muc-autojoin} from @code{jabber-post-connect-hooks}.
 
 Please note, that @code{jabber-muc-default-nicknames} and
-@code{jabber-muc-autojoin} are machine-local. To make them available
-to any client on any machine, import them in your bookmarks. See
-@xref{Bookmarks}.
-
-@node Bookmarks, Invitations, Automation, Groupchat
-@section Bookmarks
-
-@cindex Bookmarks
-@findex jabber-edit-bookmarks
-
-You can store your conference settings on server-side to make them
-available from any machine and client. Use @code{M-x
-jabber-edit-bookmarks} to edit server-side bookmarks.
+@code{jabber-muc-autojoin} are machine-local, but apply to @emph{all}
+accounts---if you connect several accounts, both will try to connect to
+the same chat rooms, or use the same nickname.  This will lead to
+confusion.
 
 @node Invitations, Private messages, Bookmarks, Groupchat
 @section Invitations

emacs-jabber jabber-bookmarks.el,1.9,1.10 jabber-muc.el,1.74,1.75

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28168

Modified Files:
	jabber-bookmarks.el jabber-muc.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-504
Creator:  Magnus Henoch <ma...@fr...>

Read MUC nickname and password from bookmarks


Index: jabber-bookmarks.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-bookmarks.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- jabber-bookmarks.el	18 May 2008 12:13:43 -0000	1.9
+++ jabber-bookmarks.el	18 May 2008 12:13:57 -0000	1.10
@@ -35,22 +35,30 @@
 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."
-  (jabber-get-bookmarks 
-   jc
-   (lexical-let ((conference-jid conference-jid)
-		 (key key)
-		 (cont cont))
-     (lambda (jc result)
-       (let ((entry
-	      (dolist (node result)
+result as arguments.  If CONT is nil, return the requested data
+immediately, and return nil if it is not in the cache."
+  (if (null cont)
+      (jabber-get-conference-data-internal
+       (jabber-get-bookmarks-from-cache jc)
+       conference-jid
+       key)
+    (jabber-get-bookmarks 
+     jc
+     (lexical-let ((conference-jid conference-jid)
+		   (key key)
+		   (cont cont))
+       (lambda (jc result)
+	 (let ((entry (jabber-get-conference-data-internal result conference-jid key)))
+	   (funcall cont jc entry)))))))
+
+(defun jabber-get-conference-data-internal (result conference-jid key)
+  (let ((entry (dolist (node result)
 		(when (and (eq (jabber-xml-node-name node) 'conference)
 			   (string= (jabber-xml-get-attribute node 'jid) conference-jid))
 		  (return (jabber-parse-conference-bookmark node))))))
-	 (funcall cont jc
-		  (if key
-		      (plist-get entry key)
-		    entry)))))))
+    (if key
+	(plist-get entry key)
+      entry)))
 
 (defun jabber-parse-conference-bookmark (node)
   "Convert a <conference/> tag into a plist.
@@ -89,6 +97,13 @@
     (puthash my-jid value jabber-bookmarks)
     (funcall cont jc (when (listp value) value))))
 
+;;;###autoload
+(defun jabber-get-bookmarks-from-cache (jc)
+  "Return cached bookmarks for JC.
+If bookmarks have not yet been fetched by `jabber-get-bookmarks',
+return nil."
+  (gethash (jabber-connection-bare-jid jc) jabber-bookmarks))
+
 (defun jabber-set-bookmarks (jc bookmarks &optional callback)
   "Set bookmarks to BOOKMARKS, which is a list of XML elements.
 If CALLBACK is non-nil, call it with JC and t or nil as arguments

Index: jabber-muc.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc.el,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- jabber-muc.el	1 Mar 2008 20:42:47 -0000	1.74
+++ jabber-muc.el	18 May 2008 12:13:57 -0000	1.75
@@ -408,7 +408,7 @@
   (interactive 
    (let ((account (jabber-read-account))
 	 (group (jabber-read-jid-completing "group: ")))
-     (list account group (jabber-muc-read-my-nickname group (plist-get (fsm-get-state-data account) :username)) t)))
+     (list account group (jabber-muc-read-my-nickname account group) t)))
 
   ;; If the user is already in the room, we don't need as many checks.
   (if (or (assoc group *jabber-active-groupchats*)
@@ -450,7 +450,9 @@
       (let ((password
 	     ;; Is the room password-protected?
 	     (when (member "muc_passwordprotected" features)
-	       (read-passwd (format "Password for %s: " (jabber-jid-displayname group))))))
+	       (or
+		(jabber-get-conference-data jc group nil :password)
+		(read-passwd (format "Password for %s: " (jabber-jid-displayname group)))))))
 
 	(jabber-groupchat-join-3 jc group nickname password popup)))))
 
@@ -479,12 +481,12 @@
     (let ((buffer (jabber-muc-create-buffer jc group)))
       (switch-to-buffer buffer))))
 
-(defun jabber-muc-read-my-nickname (group default)
+(defun jabber-muc-read-my-nickname (jc group)
   "Read nickname for joining GROUP."
   (let ((default-nickname (or
-			   ;; XXX: use bookmarks
+			   (jabber-get-conference-data jc group nil :nick)
 			   (cdr (assoc group jabber-muc-default-nicknames))
-			   default)))
+			   (plist-get (fsm-get-state-data jc) :username))))
     (jabber-read-with-input-method (format "Nickname: (default %s) "
 					   default-nickname) 
 				   nil nil default-nickname)))
@@ -647,7 +649,7 @@
 	      (let ((action
 		     `(lambda (&rest ignore) (interactive)
 			(jabber-groupchat-join jabber-buffer-connection ,group
-					       (jabber-muc-read-my-nickname ,group ,(plist-get (fsm-get-state-data jabber-buffer-connection) :username))))))
+					       (jabber-muc-read-my-nickname ,jabber-buffer-connection ,group)))))
 		(if (fboundp 'insert-button)
 		    (insert-button "Accept"
 				   'action action)

emacs-jabber jabber-bookmarks.el,1.8,1.9

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28148

Modified Files:
	jabber-bookmarks.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-503
Creator:  Magnus Henoch <ma...@fr...>

jabber-set-bookmarks: call jabber-private-set with correct arguments


Index: jabber-bookmarks.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-bookmarks.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jabber-bookmarks.el	20 Apr 2008 06:21:41 -0000	1.8
+++ jabber-bookmarks.el	18 May 2008 12:13:43 -0000	1.9
@@ -1,6 +1,6 @@
 ;; jabber-bookmarks.el - bookmarks according to XEP-0048
 
-;; Copyright (C) 2007 - Magnus Henoch - ma...@fr...
+;; Copyright (C) 2007, 2008 - Magnus Henoch - ma...@fr...
 
 ;; This file is a part of jabber.el.
 
@@ -96,6 +96,7 @@
   (unless callback
     (setq callback #'ignore))
   (jabber-private-set
+   jc
    `(storage ((xmlns . "storage:bookmarks"))
 	     ,@bookmarks)
    callback t

emacs-jabber jabber.texi,1.95,1.96

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28133

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-502
Creator:  Magnus Henoch <ma...@fr...>

Documentation: roster buffer


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- jabber.texi	18 May 2008 12:13:19 -0000	1.95
+++ jabber.texi	18 May 2008 12:13:33 -0000	1.96
@@ -386,36 +386,41 @@
 @cindex Roster buffer, basics
 @cindex Menus
 @cindex Key bindings
-@findex jabber-display-roster
 
 The roster buffer is called @code{*-jabber-*}.  It simply contains a
-list of the contacts on your roster.
+list of the contacts on your roster.  If you have several accounts
+connected, contacts will be grouped by account.
 
 In the roster buffer, any command which requires a JID will default to
 the JID under point when called.  These commands can be called through
 either keyboard menus or mouse menus.  To open a menu with the mouse,
 simply press the second mouse button over the JID in
 question.@footnote{For some reason, mouse menus don't work in XEmacs.
-Patches welcome.}  This will bring up a menu with all available
+Patches are welcome.}  This will bring up a menu with all available
 actions.  The keyboard menus are split into categories: Chat, Roster,
 Information, MUC (Multi-User Chat, or groupchat) and Services, opened
 by @kbd{C-c C-c}, @kbd{C-c C-r}, @kbd{C-c C-i}, @kbd{C-c C-m} and
 @kbd{C-c C-s}, respectively.
 
+@vindex jabber-roster-show-bindings
 A list of keybindings is displayed at the top of the roster buffer.
 You can turn it off by setting @code{jabber-roster-show-bindings} to
 nil.
 
-You can call @code{jabber-display-roster} to redisplay your roster
-according to changed preferences (@pxref{Customizing the roster
-buffer}).  This will not refetch your roster from the server.
-Refetching the roster is usually not needed, since updates are pushed
-to clients automatically.
+@findex jabber-display-roster
+You can call @code{jabber-display-roster} (bound to @kbd{g}) to
+redisplay your roster according to changed preferences
+(@pxref{Customizing the roster buffer}).  This will not refetch your
+roster from the server.  Refetching the roster is usually not needed,
+since updates are pushed to clients automatically.
 
 You can choose not to have the roster updated automatically on
 presence changes (@pxref{Presence alerts}).  In that case, you need to
 call @code{jabber-display-roster} manually.
 
+@vindex jabber-show-offline-contacts
+@cindex Hiding offline contacts
+@cindex Offline contacts, hiding
 Please note, that by default offline contacts showed in roster as any
 others. To hide them, you can use @kbd{o} in roster buffer. To
 permanently hide them, customize @code{jabber-show-offline-contacts}

emacs-jabber jabber.texi,1.94,1.95

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28115

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-501
Creator:  Magnus Henoch <ma...@fr...>

Documentation: presence subscription


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- jabber.texi	18 May 2008 12:13:08 -0000	1.94
+++ jabber.texi	18 May 2008 12:13:19 -0000	1.95
@@ -355,11 +355,21 @@
 
 Having permission to view the presence status of a person is called
 @dfn{subscribing to his presence}.  Presence subscription between two
-persons can be asymmetric.
+persons can be asymmetric.  Subscription state is shown in the roster
+display by arrows (@pxref{Customizing the roster buffer}).  A
+left-pointing arrow means that the contact can see your presence
+(``from'').  A right-pointing arrow means that you can see the contact's
+presence (``to'').  The most common case is mutual subscription, a
+double-ended arrow (``both'').
 
 When jabber.el receives a presence subscription request, it will present
 it to you in a chat buffer, and offer you to choose subscription mode
-and send a subscription request back to that person.
+and send a subscription request back to that person.  The ``Mutual''
+button accepts the request and sends a reciprocal request.@footnote{If this
+request is superfluous, the server will drop it without bothering the
+contact.}  The ``One-way'' button accepts the request, but doesn't ask
+for a subscription in return.  The ``Decline'' button declines the
+request.
 
 To request subscription to someone, type @kbd{M-x
 jabber-send-subscription-request}.  You will be prompted for the JID

emacs-jabber jabber.texi,1.93,1.94

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28058

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-500
Creator:  Magnus Henoch <ma...@fr...>

Documentation: presence


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- jabber.texi	18 May 2008 12:12:55 -0000	1.93
+++ jabber.texi	18 May 2008 12:13:08 -0000	1.94
@@ -246,12 +246,12 @@
 @vindex jabber-default-status
 @vindex jabber-default-priority
 
-``Presence'' is the Jabber term for letting other people know that you
+@dfn{Presence} is the Jabber term for letting other people know that you
 are online, and additionally how ``available'' you are.  There are
-three elements to presence: availability status (called ``show''),
+three elements to presence: availability state (called ``show''),
 status message, and priority.
 
-Your show status may either be empty (meaning simply ``online''), or
+Your show state may either be empty (meaning simply ``online''), or
 one of @code{away}, @code{xa}, @code{dnd} and @code{chat}, meaning
 ``away'', ``extended away'' (i.e. away for an extended period), ``do
 not disturb'', and ``free for chat'', respectively.  This information
@@ -264,18 +264,27 @@
 whatever you want.  It is sent to everyone subscribing to your
 presence, but not all clients prominently display it to the user.
 
-The priority is only interesting if you are running more than one
-Jabber client at a time accessing the same account.  In that case,
-messages sent to you without an indication of which client to send to
-are sent to the client with the highest priority.
+The priority is only interesting if you are running more than one Jabber
+client at a time accessing the same account.  @xref{Resources and
+priority}.
 
-To set your presence, use the function @code{jabber-send-presence}.
+To set your presence, use the function @code{jabber-send-presence}
+(bound to @kbd{C-x C-j C-p}).
 It can be called both interactively and in Lisp code.  For the latter
 case, use something like @code{(jabber-send-presence "away" "idle for
-10 minutes" 10)}.
+10 minutes" 10)}.  There are a few shortcuts:
+@table @kbd
+@item C-x C-j C-a
+Send ``away'' presence (with prefix argument, specify status text)
+@item C-x C-j C-x
+Send ``extended away'' presence (with prefix argument, specify status
+text)
+@item C-x C-j C-o
+Send default presence (see below)
+@end table
 
 By default, jabber.el sets your presence when you connect.  If you
-want it not to do that, remove @code{jabber-send-default-presence}
+want it not to do that, remove @code{jabber-send-current-presence}
 from @code{jabber-post-connect-hooks}.  If you want to change the
 presence that is sent, change the variables
 @code{jabber-default-show}, @code{jabber-default-status} and
@@ -283,6 +292,49 @@
 
 With jabber.el, you can set your presence remotely.  @xref{Ad-Hoc Commands}.
 
+@menu
+* Resources and priority::      
+* Directed presence::           
+@end menu
+
+@node Resources and priority, Directed presence, Presence, Presence
+@subsection Resources and priority
+
+@cindex Resource
+@cindex Priority
+
+Every connection to an account has a specific name, a @dfn{resource}.
+The account itself has a JID of the form
+@samp{@var{username}@@@var{server}} (a @dfn{bare JID}), but the
+connections have JIDs of the form
+@samp{@var{username}@@@var{server}/@var{resource}} (a @dfn{full JID}).
+You can choose the resource name yourself by entering a JID of the
+latter form at the connection prompt (@pxref{Connecting}), or by
+configuring it in @code{jabber-account-list} (@pxref{Account settings})
+
+Each session has a @dfn{priority}.  The priority determines what happens
+when a message is sent to the bare JID (i.e. without specifying what
+connection should receive message).  Such messages are delivered to the
+connection with the highest non-negative priority value.  If there are
+no connections, or if all connections have negative priority, the
+message is either stored on the server for later delivery or bounced to
+the sender, depending on the server configuration.
+
+If there are several connections with the same priority, the behaviour
+depends on the server.  Some server implementations deliver the message
+to all such connections, while others choose one connection depending on
+certain rules.
+
+Note that these rules do not apply when a message is sent to a full
+JID.  Such messages are sent to the specified resource, if it is still
+connected, and otherwise treated as messages to the bare JID.  In the
+chat buffers of jabber.el, messages are sent to whatever JID the last
+message came from (usually a full JID), or to the bare JID if no message
+has been received yet.  Other clients may have different behaviour.
+
+@node Directed presence,  , Resources and priority, Presence
+@subsection Directed presence
+
 @cindex directed presence
 @cindex send directed presence
 @findex jabber-send-directed-presence
@@ -306,7 +358,7 @@
 persons can be asymmetric.
 
 When jabber.el receives a presence subscription request, it will present
-it to you in an chat buffer, and offer you to choose subscription mode
+it to you in a chat buffer, and offer you to choose subscription mode
 and send a subscription request back to that person.
 
 To request subscription to someone, type @kbd{M-x
@@ -1362,7 +1414,6 @@
 @cindex Resource
 @cindex Password
 @cindex JID
-@cindex Resource
 @cindex Network server
 
 All account settings reside in @code{jabber-account-list} variable.

emacs-jabber jabber.texi,1.92,1.93

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27712

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-499
Creator:  Magnus Henoch <ma...@fr...>

Documentation: chatting


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- jabber.texi	18 May 2008 12:12:39 -0000	1.92
+++ jabber.texi	18 May 2008 12:12:55 -0000	1.93
@@ -212,6 +212,12 @@
 put point over the person you want to chat with in the roster display
 and hit RET.
 
+You can also use the function @code{jabber-chat-with}.  This function is
+bound to @kbd{C-x C-j C-j} in the global keymap.  You will be asked to
+enter a JID in the minibuffer.  You can also enter the roster name of
+one of your contacts.  All JIDs and names in your roster can be
+tab-completed.
+
 You can also use menus to access commands.  In the roster display, you
 can access several menus through keystrokes or mouse clicks.  You can
 bring one big menu up by pressing the second mouse button, or you can
@@ -219,18 +225,15 @@
 latter while point is on a roster entry, that entry will be the
 default value when you are asked for whom to chat with.
 
-You can also use the function @code{jabber-chat-with}, which is what the
-menu item is bound to.  This function is bound to @kbd{C-x C-j C-j} in
-the global keymap.
-
 Now, try opening a chat with someone.  A buffer named
 @code{*-jabber-chat-:-@var{person}-*} will be created and selected.
 Type your message at the end of the buffer, and hit @kbd{RET} to send
 it.  To include a newline in your message, use @kbd{C-j}.
 
 When you receive a message from someone, you will see a red indicator in
-the mode line.  You can click this indicator or type @kbd{C-x C-j C-l}
-to switch to the relevant buffer.
+the mode line.  You can click this indicator with the mouse, or type
+@kbd{C-x C-j C-l} to switch to the relevant buffer.  @xref{Tracking
+activity}.
 
 @node Presence, Presence subscription, Chatting, Basic operation
 @section Presence

emacs-jabber jabber.texi,1.91,1.92

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27692

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-498
Creator:  Magnus Henoch <ma...@fr...>

Documentation: hack registration and connection


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- jabber.texi	14 May 2008 21:11:44 -0000	1.91
+++ jabber.texi	18 May 2008 12:12:39 -0000	1.92
@@ -118,7 +118,7 @@
 
 This chapter is intended as an introduction to basic usage of
 jabber.el.  If you have used Jabber before and are familiar with the
-terminology, you might find it a bit too basic --- in that case, just
+terminology, you might find it a bit too basic---in that case, just
 skim it, making sure to pick up the commands mentioned.
 
 I'll assume that you have already successfully installed jabber.el; if
@@ -154,7 +154,7 @@
 
 @item
 LJ Talk (of Livejournal) uses Jabber.  Your Jabber ID is
-@code{@samp{ljusername}@@livejournal.com}.
+@samp{@var{ljusername}@@livejournal.com}.
 @end itemize
 
 @node Registering an account, Connecting, Do you have a Jabber account?, Basic operation
@@ -162,15 +162,16 @@
 
 @cindex Registering an account
 
-TBD
+If you do not yet have a Jabber account, you can register one.  The
+registration processes for various servers differ, but many servers
+support so-called ``in-band registration'', which is described in this
+section.
 
-If you do not yet have a Jabber account, you can register one.  Enter
-your desired username and the server you wish
-to use in @code{jabber-account-list}, save, and type @kbd{C-u M-x
-jabber-connect}.  If the server supports
-in-band registration, you will be presented with a registration form to
-fill out and send.  There the username you chose will be prefilled.
-Don't change it, otherwise jabber.el will be confused.
+To register an account, type @kbd{C-u M-x jabber-connect} and enter your
+desired JID in the form @samp{@var{username}@@@var{server}}.  You will
+be presented with a registration form to fill out and send.  There the
+username you chose will be prefilled.  After registration, you can
+connect to the server as usual.
 
 @node Connecting, Chatting, Registering an account, Basic operation
 @section Connecting
@@ -198,7 +199,8 @@
 settings}.  If you configure more than one account, all of them will be
 connected when you type @kbd{C-x C-j C-c}, as that key is bound to
 @code{jabber-connect-all}.  To connect only one account, possibly one
-that's not in your list, type @kbd{M-x jabber-connect}.
+that's not in your list, type @kbd{M-x jabber-connect} or @kbd{C-u C-x
+C-j C-c}.
 
 @node Chatting, Presence, Connecting, Basic operation
 @section Chatting

emacs-jabber README,1.22,1.23

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27680

Modified Files:
	README 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-497
Creator:  Magnus Henoch <ma...@fr...>

Mention need to generate jabber-autoloads.el


Index: README
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/README,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- README	24 Apr 2008 02:19:59 -0000	1.22
+++ README	18 May 2008 12:12:27 -0000	1.23
@@ -69,7 +69,8 @@
 /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.
+your .emacs file.  (If you got the code from CVS, you still need the
+makefile to generate jabber-autoloads.el.)
 
 If you are upgrading from 0.7-0.7.x, you need to update your
 configuration.  See the section "Account settings" in the manual.

emacs-jabber/tests history.el,1.1,1.2

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber/tests
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6281/tests

Modified Files:
	history.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-496
Creator:  Magnus Henoch <ma...@fr...>

s/insert-file-literally/insert-file-contents-literally/


Index: history.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/tests/history.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- history.el	15 May 2008 23:36:28 -0000	1.1
+++ history.el	16 May 2008 00:28:47 -0000	1.2
@@ -11,7 +11,7 @@
       (progn
 	(jabber-history-log-message "in" "ro...@mo.../Balcony" nil "hi" our-time)
 	(with-temp-buffer
-	  (insert-file-literally jabber-global-history-filename)
+	  (insert-file-contents-literally jabber-global-history-filename)
 	  (let ((expected "\\[\"\\([^\"]+\\)\" \"in\" \"ro...@mo.../Balcony\" \"me\" \"hi\"]\n")
 		(actual (buffer-string)))
 	    (unless (string-match expected actual)

emacs-jabber/tests history.el,NONE,1.1 Makefile.am,1.1,1.2

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber/tests
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16771/tests

Modified Files:
	Makefile.am 
Added Files:
	history.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-495
Creator:  Magnus Henoch <ma...@fr...>

Don't lose messages when unable to write them to history file


--- NEW FILE: history.el ---
;; Tests for history

(require 'jabber-history)

;; 1. Smoke test
(let ((jabber-use-global-history t)
      (jabber-global-history-filename (make-temp-file "history-test"))
      ;; Jabber's birthday :)
      (our-time (encode-time 0 0 0 4 1 1999 0)))
  (unwind-protect
      (progn
	(jabber-history-log-message "in" "ro...@mo.../Balcony" nil "hi" our-time)
	(with-temp-buffer
	  (insert-file-literally jabber-global-history-filename)
	  (let ((expected "\\[\"\\([^\"]+\\)\" \"in\" \"ro...@mo.../Balcony\" \"me\" \"hi\"]\n")
		(actual (buffer-string)))
	    (unless (string-match expected actual)
	      (error "Testcase 1 failed; %S doesn't match %S" actual expected))
	    ;; The timestamps don't match for some reason...
	    ;; (let ((timestamp (match-string 1 actual)))
;; 	      (unless (equal (jabber-parse-time timestamp) our-time)
;; 		(error "Testcase 1 failed; timestamp %S didn't match %S (%S vs %S)" timestamp (jabber-encode-time our-time) (jabber-parse-time timestamp) our-time)))
	    )))
    (delete-file jabber-global-history-filename)))

;; 2. Test with unwritable history file - should not signal an error
;; This should reflect out-of-disk condition too.
(let ((jabber-use-global-history t)
      (jabber-global-history-filename (make-temp-file "history-test")))
  (set-file-modes jabber-global-history-filename #o444)
  (unwind-protect
      (progn
	(jabber-history-log-message "in" "ro...@mo.../Balcony" nil "hi" nil)
	(message "Please ignore the preceding \"Unable to write history\" error message.")
	;; No error signalled - we're done.
	)
    (delete-file jabber-global-history-filename)))

;; arch-tag: 43dd7ffe-22d7-11dd-9a7c-000a95c2fcd0

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/tests/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:43 -0000	1.1
+++ Makefile.am	15 May 2008 23:36:28 -0000	1.2
@@ -1,3 +1,3 @@
 TESTS_ENVIRONMENT = $(EMACS) -batch -L $(top_builddir) -l
-TESTS = skip-tag-forward.el
+TESTS = skip-tag-forward.el history.el
 dist_noinst_DATA = $(TESTS)

emacs-jabber jabber-history.el,1.30,1.31

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16771

Modified Files:
	jabber-history.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-495
Creator:  Magnus Henoch <ma...@fr...>

Don't lose messages when unable to write them to history file


Index: jabber-history.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-history.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- jabber-history.el	8 Mar 2008 12:42:24 -0000	1.30
+++ jabber-history.el	15 May 2008 23:36:28 -0000	1.31
@@ -1,6 +1,6 @@
 ;; jabber-history.el - recording message history
 
-;; Copyright (C) 2004, 2007 - Magnus Henoch - ma...@fr...
+;; Copyright (C) 2004, 2007, 2008 - Magnus Henoch - ma...@fr...
 ;; Copyright (C) 2004 - Mathias Dahl
 
 ;; This file is a part of jabber.el.
@@ -160,7 +160,10 @@
 	(make-directory jabber-history-dir))
       (when (jabber-rotate-history-p history-file)
 	(jabber-history-rotate history-file))
-      (write-region (point-min) (point-max) history-file t 'quiet))))
+      (condition-case e
+	  (write-region (point-min) (point-max) history-file t 'quiet)
+	(error
+	 (message "Unable to write history: %s" (error-message-string e)))))))
 
 (defun jabber-history-query (start-time
 			     end-time

emacs-jabber jabber.texi,1.90,1.91

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv21090

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-494
Creator:  Magnus Henoch <ma...@fr...>

s/jabber-post-connect-hook/jabber-post-connect-hooks/ in documentation

Patch by Valery V. Vorotyntsev


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- jabber.texi	28 Apr 2008 22:49:09 -0000	1.90
+++ jabber.texi	14 May 2008 21:11:44 -0000	1.91
@@ -271,7 +271,7 @@
 
 By default, jabber.el sets your presence when you connect.  If you
 want it not to do that, remove @code{jabber-send-default-presence}
-from @code{jabber-post-connect-hook}.  If you want to change the
+from @code{jabber-post-connect-hooks}.  If you want to change the
 presence that is sent, change the variables
 @code{jabber-default-show}, @code{jabber-default-status} and
 @code{jabber-default-priority}.
@@ -446,7 +446,7 @@
 If you want to automatically join certain rooms when connecting, you
 can set @code{jabber-muc-autojoin} to a list containing the JIDs of
 the rooms you want to enter.  To disable this feature, remove
-@code{jabber-muc-autojoin} from @code{jabber-post-connect-hook}.
+@code{jabber-muc-autojoin} from @code{jabber-post-connect-hooks}.
 
 Please note, that @code{jabber-muc-default-nicknames} and
 @code{jabber-muc-autojoin} are machine-local. To make them available
@@ -928,9 +928,9 @@
 that you might not answer immediately.
 
 To activate this feature, add @code{jabber-autoaway-start} to
-@code{jabber-post-connect-hook}, e.g:
+@code{jabber-post-connect-hooks}, e.g:
 @example
-(add-hook 'jabber-post-connect-hook 'jabber-autoaway-start)
+(add-hook 'jabber-post-connect-hooks 'jabber-autoaway-start)
 @end example
 
 There are different methods to find how long you have been ``idle''.
@@ -1811,11 +1811,12 @@
 purpose.
 
 @table @code
-@vindex jabber-post-connect-hook
-@item jabber-post-connect-hook
+@vindex jabber-post-connect-hooks
+@item jabber-post-connect-hooks
 This hook is called after successful connection and authentication.
 By default it contains @code{jabber-send-default-presence}
-(@pxref{Presence}).
+(@pxref{Presence}).  The hook functions get the connection object as
+argument.
 
 @vindex jabber-lost-connection-hook
 @item jabber-lost-connection-hook

emacs-jabber jabber-roster.el,1.52,1.53

[Evgenii T. <evg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9444

Modified Files:
	jabber-roster.el 
Log Message:
jabber-roster-sort-by-group defined to allow roster sorting by group


Index: jabber-roster.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-roster.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- jabber-roster.el	21 Aug 2007 23:27:53 -0000	1.52
+++ jabber-roster.el	29 Apr 2008 12:59:17 -0000	1.53
@@ -269,6 +269,16 @@
      ((string= a-name b-name) 0)
      (t 1))))
 
+(defun jabber-roster-sort-by-group (a b)
+  "Sort roster items by group membership."
+  (flet ((first-group (item) (or (car (get item 'groups)) "")))
+    (let ((a-group (first-group a))
+	  (b-group (first-group b)))
+      (cond
+       ((string-lessp a-group b-group) -1)
+       ((string= a-group b-group) 0)
+       (t 1)))))
+
 (defun jabber-fix-status (status)
   "Make status strings more readable"
   (when status

emacs-jabber jabber.texi,1.89,1.90

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19689

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-492
Creator:  Magnus Henoch <ma...@fr...>

Hack "Basic operation" (more to be done)


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- jabber.texi	28 Apr 2008 14:47:45 -0000	1.89
+++ jabber.texi	28 Apr 2008 22:49:09 -0000	1.90
@@ -121,11 +121,18 @@
 terminology, you might find it a bit too basic --- in that case, just
 skim it, making sure to pick up the commands mentioned.
 
+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)} or @code{(load "jabber-autoloads")} in your
+@file{.emacs}.
+
 There are a handful of global keybindings for common commands.  They
 start with @kbd{C-x C-j}, and you can get a list of them by typing
 @kbd{C-x C-j C-h}.
 
 @menu
+* Do you have a Jabber account?::  
+* Registering an account::      
 * Connecting::                  
 * Chatting::                    
 * Presence::                    
@@ -133,28 +140,29 @@
 * Roster buffer::               
 @end menu
 
-@node Connecting, Chatting, Basic operation, Basic operation
-@section Connecting
+@node Do you have a Jabber account?, Registering an account, Basic operation, Basic operation
+@section Do you have a Jabber account?
 
-@findex jabber-connect-all
-@findex jabber-connect
-@findex jabber-disconnect-all
-@findex jabber-disconnect
+Jabber has become rather popular as an instant messaging technology.
+Several sites use it, but often not under the names ``Jabber'' or
+``XMPP''.  Examples:
 
-@cindex Connecting
-@cindex Registering an account
+@itemize @bullet
+@item
+Google Talk uses Jabber.  If you have a Gmail address, you can use it as
+a Jabber ID.  @xref{Account settings}, for Google-specific configuration.
 
-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)} or @code{(load "jabber-autoloads")}in your
-@file{.emacs}.
+@item
+LJ Talk (of Livejournal) uses Jabber.  Your Jabber ID is
+@code{@samp{ljusername}@@livejournal.com}.
+@end itemize
 
-Now, type @kbd{M-x jabber-customize}. This brings up a customize
-buffer for jabber.el. One variable to customize are
-@code{jabber-account-list}. It sets accounts, that jabber.el knows about. See
-comments for this variable to learn how to set it up. Save your
-changes, and type @kbd{M-x jabber-connect-all} or @kbd{C-x C-j C-c} to
-connect. Use @kbd{M-x jabber-connect} to connect just one account (or just type @kbd{C-u C-x C-j C-c}).
+@node Registering an account, Connecting, Do you have a Jabber account?, Basic operation
+@section Registering an account
+
+@cindex Registering an account
+
+TBD
 
 If you do not yet have a Jabber account, you can register one.  Enter
 your desired username and the server you wish
@@ -164,8 +172,19 @@
 fill out and send.  There the username you chose will be prefilled.
 Don't change it, otherwise jabber.el will be confused.
 
-If you successfully connect, jabber.el will download your roster and
-display it in a buffer called @code{*-jabber-*}.
+@node Connecting, Chatting, Registering an account, Basic operation
+@section Connecting
+
+@findex jabber-connect-all
+@findex jabber-connect
+@findex jabber-disconnect-one
+@findex jabber-disconnect
+
+@cindex Connecting
+
+Now, type @kbd{C-x C-j C-c} and enter your JID and password.  If you
+successfully connect, jabber.el will download your roster and display it
+in a buffer called @code{*-jabber-*}.
 
 By default, you will appear as ``online'' to your contacts.  To change
 this to e.g. ``away'', type @kbd{M-x jabber-send-presence} or @kbd{C-x
@@ -174,6 +193,13 @@
 To disconnect, type @kbd{M-x jabber-disconnect} or @kbd{C-x C-j C-d}.
 Use @kbd{M-x jabber-disconnect-one} to disconnect just one account (or just type @kbd{C-u C-x C-j C-d}).
 
+If you don't want to type your JID every time you connect, you can save
+it in the variable @code{jabber-account-list}.  @xref{Account
+settings}.  If you configure more than one account, all of them will be
+connected when you type @kbd{C-x C-j C-c}, as that key is bound to
+@code{jabber-connect-all}.  To connect only one account, possibly one
+that's not in your list, type @kbd{M-x jabber-connect}.
+
 @node Chatting, Presence, Connecting, Basic operation
 @section Chatting
 

emacs-jabber jabber.texi,1.88,1.89

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32595

Modified Files:
	jabber.texi 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-491
Creator:  Magnus Henoch <ma...@fr...>

Hack front page and introduction


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- jabber.texi	25 Apr 2008 14:51:04 -0000	1.88
+++ jabber.texi	28 Apr 2008 14:47:45 -0000	1.89
@@ -23,7 +23,7 @@
 
 @titlepage
 @title jabber.el
-@subtitle where Emacs and Jabber meet
+@subtitle instant messaging for Jabber
 @author by Magnus Henoch and Tom Berger
 
 @page
@@ -75,12 +75,12 @@
 As a Jabber client, jabber.el is mostly just a face in the crowd,
 except that it uses buffers where GUI clients have windows.  There is
 a roster buffer, and to chat with someone you open a chat buffer, and
-there are browse buffers (increasingly inexactly named) for
+there are buffers for
 interaction with servers and services.  Then again, jabber.el delivers
 excellent console performance and customizable hooks (if you have
 speech synthesizer software, hook it up to your presence alerts).
 
-jabber.el does not yet support GPG, sending and receiving
+jabber.el does not yet support PGP encryption, sending and receiving
 roster items, and various other things.
 
 @menu
@@ -90,12 +90,28 @@
 @node Contact,  , Introduction, Introduction
 @section Contact
 
-jabber.el is developed by Tom Berger (e-mail
-@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://emacs-jabber.sf.net/}, and a Sourceforge
-project page at @uref{http://sourceforge.net/projects/emacs-jabber}.
+@itemize @bullet
+@item
+There is a web page at
+@uref{http://emacs-jabber.sf.net/}.
+
+@item
+There is a Sourceforge
+project page at @uref{http://sourceforge.net/projects/emacs-jabber},
+with bug and patch trackers.
+
+@item
+There is a mailing list:
+@uref{mailto:emacs-jabber-general@@lists.sourceforge.net},
+@uref{https://lists.sourceforge.net/lists/listinfo/emacs-jabber-general},
+@uref{http://dir.gmane.org/gmane.emacs.jabber.general}
+
+@item
+There is a chat room, @code{jabber.el@@conference.jabber.se}.  If you
+have successfully connected, you can join it by typing @kbd{M-x
+jabber-groupchat-join} and entering the address.
+
+@end itemize
 
 @node Basic operation, Groupchat, Introduction, Top
 @chapter Basic operation