[SCM] emacs-jabber branch, master, updated. 0b8d811023c7adfeac5a1267f2933651d550b2e9

[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  0b8d811023c7adfeac5a1267f2933651d550b2e9 (commit)
       via  295525b6183187233cba8799b028975ea39a1a51 (commit)
      from  9f8ef893f3154864d0c18e55b2c01923388384e1 (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 0b8d811023c7adfeac5a1267f2933651d550b2e9
Author: Magnus Henoch <leg...@us...>
Date:   Sun Apr 15 11:24:11 2012 +0100

    Mention tmux alerts in the documentation

diff --git a/jabber.texi b/jabber.texi
index d11533a..8e3687d 100644
--- a/jabber.texi
+++ b/jabber.texi
@@ -2027,6 +2027,10 @@ The @code{screen} alerts send a message through the Screen terminal
 manager@footnote{See @uref{http://www.gnu.org/software/screen/}.}.  They do no
 harm if called when you don't use Screen.
 
+@cindex Tmux terminal manager
+The @code{tmux} alerts send a message through the tmux terminal
+manager@footnote{See @uref{http://tmux.sourceforge.net/}.}.
+
 @cindex Ratpoison window manager
 @cindex Window manager, Ratpoison
 The @code{ratpoison} alerts send a message through the Ratpoison

commit 295525b6183187233cba8799b028975ea39a1a51
Author: Michael Cardell Widerkrantz <mc...@ha...>
Date:   Sun Apr 15 11:21:03 2012 +0100

    Add tmux alerts

diff --git a/AUTHORS b/AUTHORS
index 8e5c201..bfb161c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,5 +25,6 @@ Xavier Maillard
 Vitaly Mayatskikh
 Alexander Solovyov
 Demyan Rogozhin
+Michael Cardell Widerkrantz
 
 arch-tag: 15700144-3BD9-11D9-871C-000A95C2FCD0
diff --git a/Makefile.am b/Makefile.am
index 4a9767f..591711b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ jabber-time.el jabber-truncate.el jabber-util.el			\
 jabber-vcard-avatars.el jabber-vcard.el jabber-version.el		\
 jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el	\
 jabber-muc-nick-coloring.el						\
-jabber-xml.el jabber.el srv.el
+jabber-xml.el jabber.el srv.el jabber-tmux.el
 
 compat_lisp_sources =
 if USE_OUR_SHA1
diff --git a/jabber-tmux.el b/jabber-tmux.el
new file mode 100644
index 0000000..27ca309
--- /dev/null
+++ b/jabber-tmux.el
@@ -0,0 +1,32 @@
+;; jabber-screen.el - emacs-jabber interface to screen
+
+;; Copyright (C) 2012 - Michael Cardell Widerkrantz <mc...@ha...>
+
+;; This file is a part of jabber.el.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+(eval-when-compile (require 'jabber-alert))
+
+(defun jabber-tmux-message (msg)
+  "Show MSG in tmux"
+  (call-process "tmux" nil nil nil "display-message" msg))
+
+; Automatically defines jabber-{message,muc,presence,info}-tmux
+; functions.
+(define-jabber-alert tmux "Show a message through the tmux terminal multiplexer"
+  'jabber-tmux-message)
+
+(provide 'jabber-tmux)
diff --git a/jabber.el b/jabber.el
index 906136d..a5c66cf 100644
--- a/jabber.el
+++ b/jabber.el
@@ -148,6 +148,7 @@ configure a Google Talk account like this:
 
 ;; External notifiers
 (require 'jabber-screen)
+(require 'jabber-tmux)
 (require 'jabber-ratpoison)
 (require 'jabber-sawfish)
 (require 'jabber-festival)

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

Summary of changes:
 AUTHORS                            |    1 +
 Makefile.am                        |    2 +-
 jabber-screen.el => jabber-tmux.el |   17 +++++++++--------
 jabber.el                          |    1 +
 jabber.texi                        |    4 ++++
 5 files changed, 16 insertions(+), 9 deletions(-)
 copy jabber-screen.el => jabber-tmux.el (68%)


hooks/post-receive
-- 
emacs-jabber