[SCM] emacs-jabber branch, master, updated. 1f858cc4f3cdabcd7380a7d08af273bcdd708c15

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".

The branch, master has been updated
       via  1f858cc4f3cdabcd7380a7d08af273bcdd708c15 (commit)
       via  23c46a69e16ca4c432cbcedc6961162bf382cfa3 (commit)
       via  4616a9ea918343112c9701a0b768be510fa7db0e (commit)
       via  2c6156a92c9ae2438a3f97aef9daaeb12ce5776f (commit)
      from  d9bbe9ba024557b1f9afd274a93964f192ebe871 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1f858cc4f3cdabcd7380a7d08af273bcdd708c15
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Jun 27 18:06:23 2015 +0100

    Don't signal error for chat states on dead connection
    
    If there is a chat buffer with chat state notifications enabled, and the
    connection being used has been lost, and the user has reconnected, and
    started typing a message in the chat buffer, then we would try to send
    the "typing" notification to the old dead connection, causing an error.
    Avoid that by ignoring errors when sending notifications.

diff --git a/jabber-chatstates.el b/jabber-chatstates.el
index 9cd561e..83090f8 100644
--- a/jabber-chatstates.el
+++ b/jabber-chatstates.el
@@ -103,7 +103,7 @@ It can be sent and cancelled several times.")
   "Send an 'paused state notification."
   (when (and jabber-chatstates-requested jabber-chatting-with)
     (setq jabber-chatstates-composing-sent nil)
-    (jabber-send-sexp
+    (jabber-send-sexp-if-connected
      jabber-buffer-connection
      `(message
        ((to . ,jabber-chatting-with)
@@ -117,7 +117,7 @@ It can be sent and cancelled several times.")
                jabber-chatting-with
 	       jabber-chatstates-requested
                (not (eq composing-now jabber-chatstates-composing-sent)))
-      (jabber-send-sexp
+      (jabber-send-sexp-if-connected
        jabber-buffer-connection
        `(message
          ((to . ,jabber-chatting-with)

commit 23c46a69e16ca4c432cbcedc6961162bf382cfa3
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Jun 27 18:05:45 2015 +0100

    Comment about srv--nslookup being Windows-specific

diff --git a/srv.el b/srv.el
index d5455bb..2309f18 100644
--- a/srv.el
+++ b/srv.el
@@ -106,6 +106,9 @@ of the list.  The list is empty if no SRV records were found."
     (call-process "nslookup" nil t nil "-type=srv" target)
     (goto-char (point-min))
     (let (results)
+      ;; This matches what nslookup prints on Windows.  It's unlikely
+      ;; to work for other systems, but on those systems we use DNS
+      ;; directly.
       (while (search-forward-regexp
               (concat "[\s\t]*priority += \\(.*\\)\r?\n"
                       "[\s\t]*weight += \\(.*\\)\r?\n"

commit 4616a9ea918343112c9701a0b768be510fa7db0e
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Jun 27 18:04:31 2015 +0100

    jabber-encode-time should use its argument
    
    Incidentally this hasn't mattered much, since most of the time we use it
    to encode the current time anyway.

diff --git a/jabber-util.el b/jabber-util.el
index b6e1304..8e4438e 100644
--- a/jabber-util.el
+++ b/jabber-util.el
@@ -467,7 +467,7 @@ Return nil if no such data available."
 (defun jabber-encode-time (time)
   "Convert TIME to a string by JEP-0082.
 TIME is in a format accepted by `format-time-string'."
-  (format-time-string "%Y-%m-%dT%H:%M:%SZ" nil t))
+  (format-time-string "%Y-%m-%dT%H:%M:%SZ" time t))
 
 (defun jabber-encode-timezone ()
   (let ((time-zone-offset (nth 0 (current-time-zone))))

commit 2c6156a92c9ae2438a3f97aef9daaeb12ce5776f
Author: Magnus Henoch <mag...@gm...>
Date:   Sat Jun 27 18:03:26 2015 +0100

    Fix time stamp retrieval in jabber-maybe-print-rare-time

diff --git a/jabber-chat.el b/jabber-chat.el
index e6486f1..6feaad5 100644
--- a/jabber-chat.el
+++ b/jabber-chat.el
@@ -455,8 +455,8 @@ This function is used as an ewoc prettyprinter."
 	 (prev-data (when prev (ewoc-data prev))))
     (flet ((entry-time (entry)
 		       (or (when (listp (cadr entry))
-			     (jabber-message-timestamp (cadr entry))
-			     (plist-get (cddr entry) :time)))))
+			     (jabber-message-timestamp (cadr entry)))
+			   (plist-get (cddr entry) :time))))
       (when (and jabber-print-rare-time
 		 (or (null prev)
 		     (jabber-rare-time-needed (entry-time prev-data)

-----------------------------------------------------------------------

Summary of changes:
 jabber-chat.el       |    4 ++--
 jabber-chatstates.el |    4 ++--
 jabber-util.el       |    2 +-
 srv.el               |    3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
emacs-jabber