[SCM] emacs-jabber branch, master, updated. e726d72a61e5743eb326a50fc0eb379f577fa0d4

[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  e726d72a61e5743eb326a50fc0eb379f577fa0d4 (commit)
      from  6c85b203ca874e5736d785eac78db05129de2ccc (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 e726d72a61e5743eb326a50fc0eb379f577fa0d4
Author: Magnus Henoch <mag...@gm...>
Date:   Sat May 3 23:42:06 2014 +0100

    Fix reporting of last timestamp
    
    Add missing concat call.

diff --git a/jabber-time.el b/jabber-time.el
index 96ebe36..299ccef 100644
--- a/jabber-time.el
+++ b/jabber-time.el
@@ -137,11 +137,12 @@
                           (string-to-number seconds)
                         (error nil))))
          (when (numberp seconds)
-           "That is, at "
-           (format-time-string "%Y-%m-%d %T"
-                               (time-subtract (current-time)
-                                              (seconds-to-time seconds)))
-           "\n"))))
+	   (concat
+	    " - that is, at "
+	    (format-time-string "%Y-%m-%d %T"
+				(time-subtract (current-time)
+					       (seconds-to-time seconds)))
+	    "\n")))))
      (t
       ;; Only hostname: uptime
       (format "%s uptime: %s seconds" from seconds)))))

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

Summary of changes:
 jabber-time.el |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
emacs-jabber