From: Magnus H. <leg...@us...> - 2013-01-28 01:28:11
|
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 d8f07cacc1865c6f33932aa75929506e8ad2e8e4 (commit) via 506e6de9f4cd37a6725ce6f19a197f8a6978a8a3 (commit) from c03c1f8d897d062591a661c7ac4f155355aa841f (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 d8f07cacc1865c6f33932aa75929506e8ad2e8e4 Author: Magnus Henoch <mag...@gm...> Date: Mon Jan 28 01:27:22 2013 +0000 jabber-ping.el: require jabber-disco Needed for jabber-advertised-features. diff --git a/jabber-ping.el b/jabber-ping.el index 6afce8e..e71267e 100644 --- a/jabber-ping.el +++ b/jabber-ping.el @@ -21,6 +21,7 @@ (require 'jabber-iq) (require 'jabber-util) (require 'jabber-menu) +(require 'jabber-disco) (add-to-list 'jabber-jid-info-menu (cons "Ping" 'jabber-ping)) commit 506e6de9f4cd37a6725ce6f19a197f8a6978a8a3 Author: Magnus Henoch <mag...@gm...> Date: Mon Jan 28 01:26:49 2013 +0000 Use LOG_COMPILER instead of TESTS_ENVIRONMENT in tests/Makefile.am TESTS_ENVIRONMENT is no longer a safe place to put an Emacs invocation. However, LOG_COMPILER was introduced in Automake 1.12 for such things. Tested with Automake 1.13.1. diff --git a/tests/Makefile.am b/tests/Makefile.am index 8679720..01f07e0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,5 @@ -TESTS_ENVIRONMENT = env top_builddir=$(top_builddir) $(EMACS) -batch -L $(top_builddir) -L $(top_srcdir) -L $(srcdir) -l +# LOG_COMPILER was introduced in Automake 1.12; don't expect "make +# check" or "make distcheck" to work with earlier versions. +LOG_COMPILER = env top_builddir=$(top_builddir) $(EMACS) -batch -L $(top_builddir) -L $(top_srcdir) -L $(srcdir) -l TESTS = load-all.el skip-tag-forward.el history.el jabberd.el nick-change-fail.el dist_noinst_DATA = $(TESTS) ----------------------------------------------------------------------- Summary of changes: jabber-ping.el | 1 + tests/Makefile.am | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- emacs-jabber |