emacs-jabber-commit — jabber.el commit messages

emacs-jabber jabber-core.el,1.92,1.93

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

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

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

Run jabber-pre-disconnect-hook in jabber-disconnect


Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- jabber-core.el	16 Aug 2008 21:57:56 -0000	1.92
+++ jabber-core.el	26 Aug 2008 01:17:15 -0000	1.93
@@ -741,21 +741,21 @@
   (interactive "P")
   (if arg
       (jabber-disconnect-one (jabber-read-account))
-      (unless *jabber-disconnecting*	; avoid reentry
-    (let ((*jabber-disconnecting* t))
-      (dolist (c jabber-connections)
-	(jabber-disconnect-one c t))
-      (setq jabber-connections nil)
+    (unless *jabber-disconnecting*	; avoid reentry
+      (let ((*jabber-disconnecting* t))
+	(run-hooks 'jabber-pre-disconnect-hook)
+	(dolist (c jabber-connections)
+	  (jabber-disconnect-one c t))
+	(setq jabber-connections nil)
 
-      (jabber-disconnected)
-      (when (interactive-p)
-	(message "Disconnected from Jabber server(s)"))))))
+	(jabber-disconnected)
+	(when (interactive-p)
+	  (message "Disconnected from Jabber server(s)"))))))
 
 (defun jabber-disconnect-one (jc &optional dont-redisplay)
   "Disconnect from one Jabber server.
 If DONT-REDISPLAY is non-nil, don't update roster buffer."
   (interactive (list (jabber-read-account)))
-  ;;(run-hooks 'jabber-pre-disconnect-hook)
   (fsm-send-sync jc :do-disconnect)
   (when (interactive-p)
     (message "Disconnected from %s"

emacs-jabber jabber.texi,1.121,1.122

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

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

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

Manual: message alerts


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- jabber.texi	25 Aug 2008 14:49:21 -0000	1.121
+++ jabber.texi	25 Aug 2008 15:00:14 -0000	1.122
@@ -1971,13 +1971,6 @@
 
 @vindex jabber-alert-message-function
 @findex jabber-message-default-message
-@vindex jabber-message-alert-same-buffer
-
-If you don't want message alerts when the chat buffer in question is
-already the current buffer, set @code{jabber-message-alert-same-buffer}
-to nil.  This affects the behaviour of the default message function, so
-you'll have to reimplement this functionality if you write your own
-message function.
 
 Set @code{jabber-alert-message-function} to your desired
 function.@footnote{Logically it should be
@@ -2002,6 +1995,13 @@
 @var{proposed-alert}, which is the result of the specified message
 function.
 
+@vindex jabber-message-alert-same-buffer
+If you don't want message alerts when the chat buffer in question is
+already the current buffer, set @code{jabber-message-alert-same-buffer}
+to nil.  This affects the behaviour of the default message function, so
+you'll have to reimplement this functionality if you write your own
+message function.
+
 @node MUC alerts, Info alerts, Message alerts, Customizing alerts
 @subsection MUC alerts
 

emacs-jabber jabber.texi,1.120,1.121

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

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

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

Manual: presence alerts


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- jabber.texi	25 Aug 2008 00:55:55 -0000	1.120
+++ jabber.texi	25 Aug 2008 14:49:21 -0000	1.121
@@ -1951,6 +1951,10 @@
 stati, respectively, and @var{statustext} is the status message if
 provided, otherwise nil.
 
+@var{oldstatus} and @var{newstatus} can be one of @code{""}
+(i.e. online), @code{"away"}, @code{"xa"}, @code{"dnd"}, @code{"chat"},
+@code{"error"} and @code{nil} (i.e. offline).
+
 @var{newstatus} can also be one of @code{"subscribe"},
 @code{"subscribed"}, @code{"unsubscribe"} and @code{"unsubscribed"}.
 

emacs-jabber jabber.texi,1.119,1.120

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

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

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

Manual: standard alerts


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- jabber.texi	25 Aug 2008 00:10:09 -0000	1.119
+++ jabber.texi	25 Aug 2008 00:55:55 -0000	1.120
@@ -1842,7 +1842,7 @@
 @cindex Alerts
 @cindex Scroll
 
-Eight alerts are already written for all four alert categories.  These
+Twelve alerts are already written for all four alert categories.  These
 all obey the result from the corresponding message function.
 
 The @code{beep} alerts simply sound the terminal bell by calling
@@ -1891,29 +1891,41 @@
 The @code{sawfish} alerts send a message through the Sawfish window
 manager.
 
+@cindex wmii window manager
+@cindex Window manager, wmii
+The @code{wmii} alerts display a message through the wmii window
+manager.
+
 @cindex xmessage
 @vindex jabber-xmessage-timeout
 The @code{xmessage} alerts send a message through the standard
 @code{xmessage} tool.  The variable @code{jabber-xmessage-timeout}
 controls how long the alert appears.
 
+@cindex OSD
+The @code{osd} alerts send a message onto your screen using
+XOSD.@footnote{XOSD can be found at
+@uref{http://www.ignavus.net/software.html}.  You also need
+@file{osd.el} from @uref{http://www.brockman.se/software/osd.el}.}
+
 @cindex Festival speech synthesis
 @cindex Speech synthesis, Festival
 The @code{festival} alerts speak the message using the Emacs interface
 of the Festival speech synthesis system@footnote{See
 @uref{http://www.cstr.ed.ac.uk/projects/festival/}.}.
 
+@cindex Scroll chat buffers
 Additionally, for one-to-one and MUC messages, there are @code{scroll}
 alerts (enabled by default), that aim to do the right thing with chat
 buffers that are visible but not active.  Sometimes you want point to
 scroll down, and sometimes not.  These functions should do what you
 mean; if they don't, it's a bug.
 
-Also, in MUC you can use family of so-called ``personal'' alerts.
-Their like other MUC alerts, but fires only if incoming message
-addresed directly to you. One example of such alert is
-@code{jabber-muc-echo-personal}, which show MUC message only if it
-addresed to you.
+Also, in MUC you can use a family of so-called ``personal'' alerts.
+They are like other MUC alerts, but fire only on incoming messages
+addresed directly to you (also known as ``private messages'').  One
+example of such an alert is @code{jabber-muc-echo-personal}, which shows
+a note for an MUC message only if it was addressed to you.
 
 Some of these functions are in the @file{jabber-alert.el} file, and the
 others are in their own files.  You can use them as templates or

emacs-jabber jabber.texi,1.118,1.119 jabber-ratpoison.el,1.2,1.3

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

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

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

Ratpoison alerts: use call-process

This is to make Emacs not get flooded by failing ratpoison processes.
Update documentation, too.


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- jabber.texi	23 Aug 2008 23:45:59 -0000	1.118
+++ jabber.texi	25 Aug 2008 00:10:09 -0000	1.119
@@ -1884,7 +1884,7 @@
 window manager@footnote{See @uref{http://ratpoison.sourceforge.net/}.}.  They
 do no harm if used when you're not running X, but if you are running X
 with another window manager, the ratpoison processes will never exit.
-You can look at them with @code{list-processes}.
+Emacs doesn't hold on to them, though.
 
 @cindex Sawfish window manager
 @cindex Window manager, Sawfish

Index: jabber-ratpoison.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-ratpoison.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jabber-ratpoison.el	20 Apr 2008 06:21:42 -0000	1.2
+++ jabber-ratpoison.el	25 Aug 2008 00:10:09 -0000	1.3
@@ -1,6 +1,6 @@
 ;; jabber-ratpoison.el - emacs-jabber interface to ratpoison
 
-;; Copyright (C) 2005 - Magnus Henoch - ma...@fr...
+;; Copyright (C) 2005, 2008 - Magnus Henoch - ma...@fr...
 
 ;; This file is a part of jabber.el.
 
@@ -22,11 +22,10 @@
 
 (defun jabber-ratpoison-message (msg)
   "Show MSG in Ratpoison"
-  ;; Possible errors include not finding the ratpoison binary, and
-  ;; too many pipes open because of message flood.
+  ;; Possible errors include not finding the ratpoison binary.
   (condition-case e
       (let ((process-connection-type))
-	(start-process "ratpoison" nil "ratpoison" "-c" (concat "echo " msg)))
+	(call-process "ratpoison" nil 0 nil "-c" (concat "echo " msg)))
     (error nil)))
   
 (define-jabber-alert ratpoison "Show a message through the Ratpoison window manager"

emacs-jabber jabber.texi,1.117,1.118

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

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

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

Manual: customizing alerts (not finished yet)


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- jabber.texi	23 Aug 2008 23:45:48 -0000	1.117
+++ jabber.texi	23 Aug 2008 23:45:59 -0000	1.118
@@ -1807,6 +1807,7 @@
   "Display a message in a fooish way"
   'foo)
 @end example
+@noindent
 and all details will be taken care of for you.
 
 The hooks take different arguments depending on category.  However,
@@ -1820,11 +1821,11 @@
 
 Alert hooks are meant for optional UI things, that are subject to
 varying user tastes, and that can be toggled by simply adding or
-removing the function to and from the hook.  For other things, there
+removing the function to and from the hook.  For other purposes, there
 are corresponding general hooks, that are defvars instead of
-defcustoms, and that are to be managed by Lisp code.  They have the
+defcustoms, and that are meant to be managed by Lisp code.  They have the
 same name as the alert hooks minus the @code{-alert} part,
-i.e. @code{jabber-message-hooks} vs @code{jabber-alert-message-hooks},
+e.g. @code{jabber-message-hooks} vs @code{jabber-alert-message-hooks},
 etc.
 
 @menu
@@ -1862,6 +1863,7 @@
 Reference Manual}, for information about customizing its behaviour.
 This is enabled by default for info requests.
 
+@cindex Sound effects
 The @code{wave} alerts play a sound file by calling
 @code{play-sound-file}.  No sound files are provided.  To use this,
 enter the names of the sound files in
@@ -1871,22 +1873,35 @@
 @code{jabber-alert-message-wave-alist} and
 @code{jabber-alert-presence-wave-alist}.
 
+@cindex Screen terminal manager
 The @code{screen} alerts send a message through the Screen terminal
-manager (see @uref{http://www.gnu.org/software/screen/}).  They do no
+manager@footnote{See @uref{http://www.gnu.org/software/screen/}.}.  They do no
 harm if called when you don't use Screen.
 
+@cindex Ratpoison window manager
+@cindex Window manager, Ratpoison
 The @code{ratpoison} alerts send a message through the Ratpoison
-window manager (see @uref{http://ratpoison.sourceforge.net/}).  They
+window manager@footnote{See @uref{http://ratpoison.sourceforge.net/}.}.  They
 do no harm if used when you're not running X, but if you are running X
 with another window manager, the ratpoison processes will never exit.
 You can look at them with @code{list-processes}.
 
+@cindex Sawfish window manager
+@cindex Window manager, Sawfish
 The @code{sawfish} alerts send a message through the Sawfish window
 manager.
 
+@cindex xmessage
+@vindex jabber-xmessage-timeout
+The @code{xmessage} alerts send a message through the standard
+@code{xmessage} tool.  The variable @code{jabber-xmessage-timeout}
+controls how long the alert appears.
+
+@cindex Festival speech synthesis
+@cindex Speech synthesis, Festival
 The @code{festival} alerts speak the message using the Emacs interface
-of the Festival speech synthesis system (see
-@uref{http://www.cstr.ed.ac.uk/projects/festival/}).
+of the Festival speech synthesis system@footnote{See
+@uref{http://www.cstr.ed.ac.uk/projects/festival/}.}.
 
 Additionally, for one-to-one and MUC messages, there are @code{scroll}
 alerts (enabled by default), that aim to do the right thing with chat

emacs-jabber jabber.texi,1.116,1.117

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

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

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

Manual: customizing the chat buffer


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- jabber.texi	23 Aug 2008 23:25:17 -0000	1.116
+++ jabber.texi	23 Aug 2008 23:45:48 -0000	1.117
@@ -1703,8 +1703,8 @@
 @cindex Faces, chat buffer
 
 You can customize the look of the prompts in the chat buffer.  There
-are separate settings for local (i.e. your own messages) and foreign
-prompts.
+are separate settings for local text (i.e. what you write) and foreign text
+(i.e. what other people write).
 
 @vindex jabber-chat-text-local
 @vindex jabber-chat-text-foreign
@@ -1731,13 +1731,14 @@
 the contact in the roster, or the JID if no name set.  For the local
 prompt, this is the username part of your JID.
 @item %u
-The username of the user.
+The username of the user (i.e. the first part of the JID).
 @item %r
 The resource.
 @item %j
 The bare JID of the user
 @end table
 
+@cindex Timestamp format
 @vindex jabber-chat-time-format
 @code{jabber-chat-time-format} defines how @code{%t} shows time.  Its
 format is identical to that passed to @code{format-time-string}.
@@ -1752,6 +1753,7 @@
 see the complete timestamp in a tooltip by hovering over the prompt with
 the mouse.
 
+@cindex Rare timestamps
 @vindex jabber-print-rare-time
 @vindex jabber-rare-time-format
 @vindex jabber-chat-text-local
@@ -1761,6 +1763,7 @@
 setting @code{jabber-rare-time-format}.  Rare timestamps will be printed
 whenever time formatted by that format string would change.
 
+@cindex Header line of chat buffers
 @vindex jabber-chat-header-line-format
 @vindex jabber-muc-header-line-format
 You can also customize the header line of chat buffers, by modifying
@@ -1773,7 +1776,7 @@
 @vindex jabber-chat-fill-long-lines
 @cindex Filling long lines in chat buffer
 The variable @code{jabber-chat-fill-long-lines} controls whether long
-lines in the chat buffer are filled.
+lines in the chat buffer are wrapped.
 
 @node Customizing alerts, Hooks, Customizing the chat buffer, Customization
 @section Customizing alerts

emacs-jabber jabber.texi,1.115,1.116

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

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

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

Manual: customizing the roster buffer


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- jabber.texi	23 Aug 2008 23:24:56 -0000	1.115
+++ jabber.texi	23 Aug 2008 23:25:17 -0000	1.116
@@ -1634,28 +1634,25 @@
 @node Customizing the roster buffer, Customizing the chat buffer, Menu, Customization
 @section Customizing the roster buffer
 
-@vindex jabber-roster-sort-functions
-@vindex jabber-sort-order
-@vindex jabber-show-resources
-@vindex jabber-roster-line-format
-@vindex jabber-resource-line-format
-@vindex jabber-roster-buffer
-@vindex jabber-roster-show-bindings
 @cindex Roster buffer, customizing
 
 @cindex Sorting the roster
+@vindex jabber-roster-sort-functions
 @code{jabber-roster-sort-functions} controls how roster items are
 sorted.  By default, contacts are sorted first by presence, and then
 alphabetically by displayed name.
 
+@vindex jabber-sort-order
 @code{jabber-sort-order} controls how roster items are sorted by
 presence.  It is a list containing strings corresponding to show
 status (@pxref{Presence}) or @code{nil}, which represents offline.
 
+@vindex jabber-show-resources
 @code{jabber-show-resources} controls when your contacts' resources
 are shown in the roster buffer.  The default is to show resources when
 a contact has more than one connected resource.
 
+@vindex jabber-roster-line-format
 @code{jabber-roster-line-format} specifies how the entry for each
 contact looks.  It is a string where some characters are special if
 preceded by a percent sign:
@@ -1664,9 +1661,9 @@
 @item %a
 Avatar of contact, if any
 @item %c
-"*" if the contact is connected, or " " if not
+@samp{*} if the contact is connected, or @samp{ } if not
 @item %u
-Subscription state - see below
+Subscription state---see below
 @item %n
 Nickname of contact, or JID if no nickname
 @item %j
@@ -1674,27 +1671,30 @@
 @item %r
 Highest-priority resource of contact
 @item %s
-Availability of contact as string ("Online", "Away" etc)
+Availability of contact as a string ("Online", "Away" etc)
 @item %S
 Status string specified by contact
 @end table
 
+@code{%u} is replaced by one of the strings given by
+`jabber-roster-subscription-display'.
+
+@vindex jabber-resource-line-format
 @code{jabber-resource-line-format} is nearly identical, except that
 the values correspond to the values of the resource in question, and
 that the @code{%p} escape is available, which inserts the priority of
 the resource.
 
+@vindex jabber-roster-buffer
 @code{jabber-roster-buffer} specifies the name of the roster buffer.
-If you change this, the new name will be used the next time you
-connect.
+If you change this, the new name will be used the next time the roster
+is redisplayed.
 
+@vindex jabber-roster-show-bindings
 @code{jabber-roster-show-bindings} controls whether to show a list of
 keybindings at the top of the roster buffer.  You need to run @kbd{M-x
 jabber-display-roster} after changing this variable to update the display.
 
-@code{%u} is replaced by one of the strings given by
-`jabber-roster-subscription-display'.
-
 @node Customizing the chat buffer, Customizing alerts, Customizing the roster buffer, Customization
 @section Customizing the chat buffer
 

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

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

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

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

Expand docstring of jabber-show-resources


Index: jabber-roster.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-roster.el,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- jabber-roster.el	29 Apr 2008 12:59:17 -0000	1.53
+++ jabber-roster.el	23 Aug 2008 23:25:06 -0000	1.54
@@ -107,7 +107,12 @@
   :group 'jabber-roster)
 
 (defcustom jabber-show-resources 'sometimes
-  "Show resources in roster?"
+  "Show contacts' resources in roster?
+This can be one of the following symbols:
+
+nil       Never show resources
+sometimes Show resources when there are more than one
+always    Always show resources"
   :type '(radio (const :tag "Never" nil)
 		(const :tag "When more than one connected resource" sometimes)
 		(const :tag "Always" always))

emacs-jabber jabber.texi,1.114,1.115

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

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

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

Manual: customization


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- jabber.texi	23 Aug 2008 23:24:44 -0000	1.114
+++ jabber.texi	23 Aug 2008 23:24:56 -0000	1.115
@@ -1551,7 +1551,7 @@
 
 @menu
 * Account settings::            
-* Miscellaneous settings::      
+* Menu::                        
 * Customizing the roster buffer::  
 * Customizing the chat buffer::  
 * Customizing alerts::          
@@ -1559,7 +1559,7 @@
 * Debug options::               
 @end menu
 
-@node Account settings, Miscellaneous settings, Customization, Customization
+@node Account settings, Menu, Customization, Customization
 @section Account settings
 
 @cindex Username
@@ -1568,7 +1568,7 @@
 @cindex JID
 @cindex Network server
 
-All account settings reside in @code{jabber-account-list} variable.
+All account settings reside in the variable @code{jabber-account-list}.
 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:
@@ -1606,8 +1606,10 @@
 
 @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
+If you have a very new version of @file{dns.el},@footnote{Specifically,
+you need Emacs 23, or No Gnus 0.3.} you can connect to
+Google Talk just by specifying your Gmail address as JID.  Otherwise,
+you also need to set
 ``network server'' to @kbd{talk.google.com} and ``connection type'' to
 ``legacy SSL''.
 
@@ -1617,8 +1619,8 @@
 @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
+@node Menu, Customizing the roster buffer, Account settings, Customization
+@section Menu
 
 @findex jabber-menu
 @cindex Menus
@@ -1629,7 +1631,7 @@
 settings, so you need to add @code{(jabber-menu)} to your @file{.emacs}
 to enable it permanently.
 
-@node Customizing the roster buffer, Customizing the chat buffer, Miscellaneous settings, Customization
+@node Customizing the roster buffer, Customizing the chat buffer, Menu, Customization
 @section Customizing the roster buffer
 
 @vindex jabber-roster-sort-functions

emacs-jabber jabber.texi,1.113,1.114

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

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

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

Manual: XMPP URIs


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- jabber.texi	23 Aug 2008 22:20:56 -0000	1.113
+++ jabber.texi	23 Aug 2008 23:24:44 -0000	1.114
@@ -1525,7 +1525,8 @@
 (in the same directory as @file{prefs.js}), and add the following line:
 
 @example
-user_pref("network.protocol-handler.app.xmpp", "@var{/path/to}/xmppuri.sh");
+user_pref("network.protocol-handler.app.xmpp",
+  "@var{/path/to}/xmppuri.sh");
 @end example
 
 Restart Mozilla for this change to take effect.

emacs-jabber jabber.texi,1.112,1.113

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

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

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

Split long paragraph


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- jabber.texi	23 Aug 2008 22:20:43 -0000	1.112
+++ jabber.texi	23 Aug 2008 22:20:56 -0000	1.113
@@ -1352,7 +1352,9 @@
 the following rule: When @code{jabber-history-size-limit} (in
 kilobytes) is reached, the @var{history-file} is renamed to
 @file{@var{history-file}-@var{number}}, where @var{number} is 1 or the smallest number
-after the last rotation.  For example, suppose you set the
+after the last rotation.
+
+For example, suppose you set the
 @code{jabber-history-size-limit} variable to 512 and you chat with
 your buddy @samp{foo@@jabber.server} using the per-contact strategy to store
 history files.  So, when the history file (@file{foo@@jabber-server})

emacs-jabber jabber.texi,1.111,1.112

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

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

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

Manual: typing notifications


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- jabber.texi	23 Aug 2008 22:14:50 -0000	1.111
+++ jabber.texi	23 Aug 2008 22:20:43 -0000	1.112
@@ -1395,16 +1395,16 @@
 
 @itemize @bullet
 @item
-Delivered to offline storage (the user will receive it on next logon)
+@samp{In offline storage} (the user will receive it on next logon)
 
 @item
-Delivered to user's client (but not necessarily displayed)
+@samp{Delivered} to user's client (but not necessarily displayed)
 
 @item
-Displayed to user
+@samp{Displayed} to user
 
 @item
-User is typing a message
+User is @samp{typing a message}
 
 @end itemize
 

emacs-jabber jabber.texi,1.110,1.111

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

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

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

Manual: message history


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- jabber.texi	23 Aug 2008 22:14:37 -0000	1.110
+++ jabber.texi	23 Aug 2008 22:14:50 -0000	1.111
@@ -1307,9 +1307,6 @@
 
 @cindex History
 @cindex Backlog
-@cindex Rotation
-@cindex Truncate
-@cindex Truncation
 @findex jabber-truncate-top
 @findex jabber-truncate-muc
 @findex jabber-truncate-chat
@@ -1324,35 +1321,40 @@
 @vindex jabber-log-lines-to-keep
 
 If you want a record of messages sent and received, set
-@code{jabber-history-enabled} to t.  By default all messages to will
+@code{jabber-history-enabled} to t.  By default all messages will
 be saved to a global history file specified by
 @code{jabber-global-history-filename}
 (@file{~/.jabber_global_message_log} by default).  If you prefer to
-store your chats' history in per-contact files, you can set the
-@code{jabber-use-global-history} variable to @code{nil}.  When using
+store your chats' history in per-contact files, you can set
+@code{jabber-use-global-history} to @code{nil}.  When using
 per-contact history, files are named by the contact JID and saved
 under the directory specified by the variable
 @code{jabber-history-dir} (default is @file{~/.emacs-jabber}).
 
-There is no facility for reading old messages yet, but just reading
-the file as text should be enough for many purposes.
-
 When you open a new chat buffer and have entries in your history file,
 the last few messages you recently exchanged with the contact in
 question will be inserted.  You can control how many messages with
 @code{jabber-backlog-number} (by default 10), and how old messages
 with @code{jabber-backlog-days} (by default 3 days).
 
+@findex jabber-chat-display-more-backlog
+If you want to see more messages, use the function
+@code{jabber-chat-display-more-backlog}, available in the Chat menu.
+This is currently the only way to view the message history, apart from
+opening the history files manually.
+
+@cindex Rotation of history files
+@cindex History file rotation
 If you worry about your history file(s) size, you can enable history
 rotation feature by setting the variable
 @code{jabber-history-enable-rotation} to @code{t} (default is
 @code{nil}).  This feature ``rotates'' your history files according to
 the following rule: When @code{jabber-history-size-limit} (in
-kilobytes) is reached, the history file is renamed to
-<history-file>-<number>, where <number> is 1 or the smallest number
+kilobytes) is reached, the @var{history-file} is renamed to
+@file{@var{history-file}-@var{number}}, where @var{number} is 1 or the smallest number
 after the last rotation.  For example, suppose you set the
 @code{jabber-history-size-limit} variable to 512 and you chat with
-your buddy foo@@jabber.server using the per-contact strategy to store
+your buddy @samp{foo@@jabber.server} using the per-contact strategy to store
 history files.  So, when the history file (@file{foo@@jabber-server})
 reaches 512K bytes, it will be renamed to @file{foo@@jabber-server-1}
 and @file{foo@@jabber-server} will be set empty. Next time
@@ -1361,11 +1363,14 @@
 presented with the per-contact history file strategy, history rotation
 works for both per-contact and global history logging strategies.
 
-If you want also to truncate chat and muc buffer from growing too
-much, you can customize jabber-alert-message-hooks and
-jabber-alert-muc-hooks by adding truncation upon receiving message.
-Truncation limit may be set by customizing
-@code{jabber-log-lines-to-keep} variable.
+@cindex Truncate
+@cindex Truncation
+If you also want to keep chat and groupchat buffers from growing too
+much, you can customize @code{jabber-alert-message-hooks} and
+@code{jabber-alert-muc-hooks} by adding truncation upon receiving
+message (@code{jabber-truncate-chat} and @code{jabber-truncate-muc}, respectively).
+The truncation limit may be set by customizing the variable
+@code{jabber-log-lines-to-keep}.
 
 @node Typing notifications, Roster import and export, Message history, Top
 @chapter Typing notifications

emacs-jabber jabber.texi,1.109,1.110

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

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

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

Manual: spell checking


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- jabber.texi	23 Aug 2008 21:58:06 -0000	1.109
+++ jabber.texi	23 Aug 2008 22:14:37 -0000	1.110
@@ -1299,7 +1299,7 @@
 what you receive or what you have already sent.  You may want to add
 @code{flyspell-mode} to @code{jabber-chat-mode-hook}.
 
-For more information about Emacs spell checking, @xref{Spelling, ,
+For more information about Emacs spell checking, @pxref{Spelling, ,
 Checking and Correcting Spelling, emacs, GNU Emacs Manual}.
 
 @node Message history, Typing notifications, Useful features, Top

emacs-jabber jabber.texi,1.108,1.109

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

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

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

Manual: tracking activity


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- jabber.texi	1 Jul 2008 11:14:42 -0000	1.108
+++ jabber.texi	23 Aug 2008 21:58:06 -0000	1.109
@@ -1241,10 +1241,10 @@
 When you're working on something important you might want to delay
 responding to incoming messages.  However, when you're done working,
 will you remember them?  If you're anything like me, you'll have a lot
-of buffers in your Emacs session, and a jabber chat buffer can easily
+of buffers in your Emacs session, and a Jabber chat buffer can easily
 get lost.
 
-When you type @kbd{M-x jabber-activity-mode} Emacs starts keeping
+When @code{jabber-activity-mode} is enabled (by default, it is), Emacs keeps
 track of the buddies which have messaged you since last you visited
 their buffer, and will display them in mode line.  As soon as you
 visit their buffer they disappear from the mode line, indicating that

emacs-jabber jabber-activity.el,1.34,1.35

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

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

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

Note problem with activity count in title


Index: jabber-activity.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-activity.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- jabber-activity.el	17 Jun 2008 14:51:42 -0000	1.34
+++ jabber-activity.el	23 Aug 2008 21:57:55 -0000	1.35
@@ -360,6 +360,11 @@
 	  ;; existing title format.  In particular, if the car is
 	  ;; a symbol, we can't just add our stuff at the beginning.
 	  ;; If the car is "", we should be safe.
+	  ;; 
+	  ;; In my experience, sometimes the activity count gets
+	  ;; included twice in the title.  I'm not sure exactly why,
+	  ;; but it would be nice to replace the code below with
+	  ;; something cleaner.
 	  (if (equal (car frame-title-format) "")
 	      (add-to-list 'frame-title-format
 			   jabber-activity-count-in-title-format)

emacs-jabber jabber-core.el,1.91,1.92

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

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

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

If the user gives no input for network server, don't try to connect to the empty string


Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- jabber-core.el	17 Jun 2008 14:47:01 -0000	1.91
+++ jabber-core.el	16 Aug 2008 21:57:56 -0000	1.92
@@ -186,6 +186,8 @@
 	 (setq network-server
 	       (read-string (format "Network server: (default `%s') " network-server)
 			    nil nil network-server))
+	 (when (zerop (length network-server))
+	   (setq network-server nil))
 	 (setq port
 	       (car
 		(read-from-string

emacs-jabber jabber-muc-nick-completion.el,1.11,1.12

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

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

Modified Files:
	jabber-muc-nick-completion.el 
Log Message:
Fix substring completion bug ("Name" and "Name2")


Index: jabber-muc-nick-completion.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc-nick-completion.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jabber-muc-nick-completion.el	20 Apr 2008 06:21:43 -0000	1.11
+++ jabber-muc-nick-completion.el	17 Jul 2008 11:15:47 -0000	1.12
@@ -114,10 +114,9 @@
 		(let ((t1 (cdr nt1))
 		      (t2 (cdr nt2)))
 		  (if (and (zerop t1) (zerop t2))
-		      (minusp (compare-strings
-			       (car nt1) 0 nil
-			       (car nt2) 0 nil
-			       t))
+		      (string<
+                       (car nt1) 
+                       (car nt2))
 		    (> t1 t2)))))
       (mapcar 'car (sort (mapcar 'fetch-time nicks)
 			  'cmp)))))

emacs-jabber jabber.texi,1.107,1.108

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

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

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

Manual: fix link


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- jabber.texi	1 Jul 2008 11:14:20 -0000	1.107
+++ jabber.texi	1 Jul 2008 11:14:42 -0000	1.108
@@ -1223,7 +1223,7 @@
 
 This is of limited use if you have to type your password every time
 jabber.el reconnects.  There are two ways to save your password: you can
-set it in @code{jabber-account-alist} (@pxref{Account Settings}), and
+set it in @code{jabber-account-alist} (@pxref{Account settings}), and
 you can use @file{password-cache.el}, which is available in
 recent versions of Gnus and in Emacs 23.  Note that you probably want to
 customize @code{password-cache-expiry} if you use the latter.

emacs-jabber jabber.texi,1.106,1.107

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

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

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

Manual: reconnecting


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- jabber.texi	1 Jul 2008 11:14:00 -0000	1.106
+++ jabber.texi	1 Jul 2008 11:14:20 -0000	1.107
@@ -1214,17 +1214,19 @@
 @section Reconnecting
 
 @cindex Reconnect
-@cindex Reconnecting
+@cindex Automatic reconnection
 @vindex jabber-auto-reconnect
 
-Jabber.el support automatic reconnection to Jabber server(s) upon lost
-connection. By default it is off. To turn on, customize
-@code{jabber-auto-reconnect} variable. You will need
-@file{password.el} to fully use this feature. It may be found in
-recent Gnus (No Gnus) or downloaded and installed separately.
+jabber.el supports automatic reconnection to Jabber server(s) upon lost
+connection.  By default it is off.  To turn on, customize
+the @code{jabber-auto-reconnect} variable.  
 
-See also comments about
-password(s) in Custom's buffer help.
+This is of limited use if you have to type your password every time
+jabber.el reconnects.  There are two ways to save your password: you can
+set it in @code{jabber-account-alist} (@pxref{Account Settings}), and
+you can use @file{password-cache.el}, which is available in
+recent versions of Gnus and in Emacs 23.  Note that you probably want to
+customize @code{password-cache-expiry} if you use the latter.
 
 @node Tracking activity, Watch buddies, Reconnecting, Useful features
 @section Tracking activity

emacs-jabber jabber.texi,1.105,1.106

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

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

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

Manual: autoaway


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- jabber.texi	17 Jun 2008 14:53:18 -0000	1.105
+++ jabber.texi	1 Jul 2008 11:14:00 -0000	1.106
@@ -1134,30 +1134,33 @@
 value of this variable should be a function that returns the number of
 seconds you have been idle.  Three functions are provided.
 
-If you are running Emacs 22 and thus have the @code{current-idle-time}
-function, it is used by default.  Note that this method only measures
-the time since you last interacted with Emacs, and thus disregards
-activity in other programs.
+If your Emacs has the @code{current-idle-time} function (which was
+introduced in Emacs 22), it is used by default.  Note that this method
+only measures the time since you last interacted with Emacs, and thus
+disregards activity in other programs.
 
-If you are using the X Window System, you can use the
-@uref{http://www.dtek.chalmers.se/~henoch/text/xprintidle.html,
-xprintidle} program.  Make sure that @code{jabber-xprintidle-program} is
-set to the correct file name.  This uses the same method as @uref{http://www.jwz.org/xscreensaver,XScreensaver}
-to find your idle time.
+If you are using the X Window System, you can use the xprintidle
+program.@footnote{@uref{http://www.dtek.chalmers.se/~henoch/text/xprintidle.html}}
+Make sure that @code{jabber-xprintidle-program} is set to the correct
+file name.  This uses the same method as
+@uref{http://www.jwz.org/xscreensaver,XScreensaver} to find your idle
+time.
 
-If you use xscreensaver program, you can use
-``xscreensaver-emacs-jabber'' perl-script for syncronize xscreensaver
-and jabber.el status. It is are simple perl-daemon that watch for
-xscreensaver status and set jabber.el's presence when needed. I.e.:
-its set XA presence when screen is blanked or locked (by hands or by
-idle timeout) and default presence when its unlocked/unblanked. To use
-it, just run ``xscreensaver-emacs-jabber'' after xscreensaver and make
-sure that your Emacs run in server mode (that you run (server-start)
-in init files. Alternativetily, you can add turn on and off
-server-mode by jabber.el's hooks).
+If you use the xscreensaver program, you can use
+the @file{xscreensaver-emacs-jabber} Perl script to synchronize xscreensaver
+and jabber.el status. It is a simple Perl daemon that watches for
+xscreensaver status and sets jabber.el's presence when needed.  I.e.:
+it sets XA presence when the screen is blanked or locked (by hands or by
+idle timeout) and default presence when it's unlocked/unblanked. To use
+it, just run @file{xscreensaver-emacs-jabber} after xscreensaver and make
+sure that your Emacs run in server mode (that you run @code{(server-start)}
+in init files; @pxref{Emacs Server, , Using Emacs as a Server, emacs,
+GNU Emacs Manual}.  Alternatively, you can turn on and off server-mode
+by jabber.el's hooks).
 
 If you are using Emacs on a GNU/Linux terminal, the function
-@code{jabber-termatime-get-idle-time} is used by default.
+@code{jabber-termatime-get-idle-time} is used by default.  It uses the
+access time of the terminal device as a measure of idle time.
 
 @node Modeline status, Keepalive, Autoaway, Useful features
 @section Modeline status

emacs-jabber jabber.texi,1.104,1.105

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

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

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

Manual: time queries


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- jabber.texi	17 Jun 2008 14:52:58 -0000	1.104
+++ jabber.texi	17 Jun 2008 14:53:18 -0000	1.105
@@ -1086,10 +1086,15 @@
 @cindex idle time, query
 @findex jabber-get-idle-time
 You can also ask a client about how long a user has been idle with
-@kbd{M-x jabber-get-idle-time}.  Not all clients support this,
+@kbd{M-x jabber-get-idle-time}.  Not all clients answer such queries,
 e.g. jabber.el doesn't.  This command can also tell the uptime of a
 server or component.
 
+The first of these commands uses the old Entity Time protocol
+(@pxref{XEP-0090}).  It has been superseded by XEP-0202, but jabber.el
+doesn't implement the newer protocol yet.  The latter two commands use
+the Last Activity protocol (@pxref{XEP-0012}).
+
 @node Useful features, Message history, Time queries, Top
 @chapter Useful features
 

emacs-jabber jabber.texi,1.103,1.104

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

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

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

Use @email instead of @uref


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- jabber.texi	17 Jun 2008 14:52:46 -0000	1.103
+++ jabber.texi	17 Jun 2008 14:52:58 -0000	1.104
@@ -102,7 +102,7 @@
 
 @item
 There is a mailing list:
-@uref{mailto:emacs-jabber-general@@lists.sourceforge.net},
+@email{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}
 

emacs-jabber jabber.texi,1.102,1.103

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

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

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

Manual: vCards and avatars


Index: jabber.texi
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.texi,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- jabber.texi	9 Jun 2008 22:47:48 -0000	1.102
+++ jabber.texi	17 Jun 2008 14:52:46 -0000	1.103
@@ -1010,16 +1010,16 @@
 @findex jabber-vcard-get
 @findex jabber-vcard-edit
 
-The Jabber way of handling personal information (name, addresses,
-phone numbers, etc) is ``vCards'' encoded in XML.  You can get
-information about a user by running @kbd{M-x jabber-vcard-get}, and
-you can edit your own information by running @kbd{M-x
-jabber-vcard-edit}.
+The Jabber way of handling personal information (name, addresses, phone
+numbers, etc) is ``vCards'' encoded in XML.@footnote{@xref{XEP-0054}.}
+You can get information about a user by running @kbd{M-x
+jabber-vcard-get}, and you can edit your own information by running
+@kbd{M-x jabber-vcard-edit}.
 
-The form for editing your information can be slightly confusing ---
-you are allowed to enter any number of addresses, phone numbers and
-e-mail addresses, each of which has a set of orthogonal properties.
-You can add and remove items with the [INS] and [DEL] buttons,
+The form for editing your information can be slightly confusing---you
+are allowed to enter any number of addresses, phone numbers and e-mail
+addresses, each of which has a set of orthogonal properties.  You can
+add and remove items with the @samp{[INS]} and @samp{[DEL]} buttons,
 respectively.
 
 This is also where you set your avatar (@pxref{Avatars}).  The size of
@@ -1038,8 +1038,8 @@
 vCard-Based Avatars.  By default, if you have an avatar in your vCard
 (@pxref{Personal information}), it will be published for others to see,
 and if other people publish their avatars, they will be displayed in the
-roster buffer and in the header line of chat buffers, assuming that your
-Emacs can display images.
+roster buffer and in the header line of chat buffers, if your Emacs can
+display images.  Otherwise, jabber.el will not fetch avatars at all.
 
 To disable retrieval of other people's avatars, set
 @code{jabber-vcard-avatars-retrieve} to nil.  To disable publishing of
@@ -1047,6 +1047,22 @@
 disable avatars in chat buffer header lines, set
 @code{jabber-chat-buffer-show-avatar} to nil.
 
+There are a number of restrictions on avatar images in the
+specification.  Most of them are not enforced by jabber.el.
+@itemize @bullet
+@item
+The image should be smaller than 8 kilobytes; this is enforced by
+jabber.el.
+@item
+The image height and width should be between 32 and 96 pixels; the
+recommended size is 64 by 64 pixels.
+@item
+The image should be square.
+@item
+The image should be in either PNG, GIF, or JPEG format.  (jabber.el will
+behave incorrectly if the image is not in a format supported by Emacs.)
+@end itemize
+
 Avatars are cached in the directory specified by
 @code{jabber-avatar-cache-directory}, by default
 @file{~/.jabber-avatars/}.  The cache is never cleaned, so you might