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 177ebecdaf34e5da2bb5e327d6c7281a38d238c7 (commit)
from 8429db91051b54c8259d7af53ad7b6d806987190 (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 177ebecdaf34e5da2bb5e327d6c7281a38d238c7
Author: Magnus Henoch <mag...@gm...>
Date: Mon Apr 7 22:56:50 2014 +0100
Simplify "OS" version in jabber:iq:version
No need to include the entire result of emacs-version; something like
Emacs 24.3 (darwin) is enough.
diff --git a/jabber-version.el b/jabber-version.el
index 455701a..5f3dc19 100644
--- a/jabber-version.el
+++ b/jabber-version.el
@@ -63,14 +63,19 @@ determined from the incoming packet passed in XML-DATA."
;; exactly one child, namely query with xmlns='jabber:iq:version'?
;; Then again, jabber-process-iq should take care of that.
(let ((to (jabber-xml-get-attribute xml-data 'from))
- (id (jabber-xml-get-attribute xml-data 'id)))
+ (id (jabber-xml-get-attribute xml-data 'id))
+ (os (format "%s %d.%d (%s)"
+ (cond ((featurep 'xemacs) "XEmacs")
+ (t "Emacs"))
+ emacs-major-version emacs-minor-version
+ system-type)))
(jabber-send-iq jc to "result"
`(query ((xmlns . "jabber:iq:version"))
(name () "jabber.el")
(version () ,jabber-version)
;; Booting... /vmemacs.el
;; Shamelessly stolen from someone's sig.
- (os () ,(emacs-version)))
+ (os () ,os))
nil nil nil nil
id)))
-----------------------------------------------------------------------
Summary of changes:
jabber-version.el | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
emacs-jabber
|
