[SCM] emacs-jabber branch, master, updated. 10c065380f088e65d6ad81595b68ecd6f084c471

[Evgenii T. <evg...@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  10c065380f088e65d6ad81595b68ecd6f084c471 (commit)
       via  60e25ef3a92a7ebe4bba7bc0f260e61a8af595dd (commit)
       via  583d31943d14f09e4364ca71d75e4ccc3bce7f7d (commit)
       via  1f38235feae68176925656f824c056153d5c2d1f (commit)
      from  cab6d24734439307b52b375dd1290727ba573354 (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 10c065380f088e65d6ad81595b68ecd6f084c471
Author: Evgenii Terechkov <ev...@al...>
Date:   Sat May 1 20:30:57 2010 +0800

    Fix ELPA package creation
    
    First, we don't know if it sha1/hex-util/hexrgb present on target
    system, so install it anyway.
    
    Second, add autoload cookie to normal loading of hexrgb.

diff --git a/Makefile.am b/Makefile.am
index 1044f06..4a9767f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,6 +74,7 @@ elpa: dist
 	mv emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION)
 	cd jabber-$(PACKAGE_VERSION) ; install-info jabber.info dir
 	sed "s/@""PACKAGE_VERSION@""/$(PACKAGE_VERSION)/" < $(srcdir)/jabber-pkg.el.in > jabber-$(PACKAGE_VERSION)/jabber-pkg.el
+	mv jabber-$(PACKAGE_VERSION)/compat/*.el jabber-$(PACKAGE_VERSION)/
 	$(AMTAR) chf jabber-$(PACKAGE_VERSION).tar jabber-$(PACKAGE_VERSION)
 	rm -rf jabber-$(PACKAGE_VERSION)
 	@echo "Created jabber-$(PACKAGE_VERSION).tar"
diff --git a/compat/hexrgb.el b/compat/hexrgb.el
index 925468c..57f2c2c 100644
--- a/compat/hexrgb.el
+++ b/compat/hexrgb.el
@@ -167,6 +167,7 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+;;;###autoload
 (eval-and-compile
  (defun hexrgb-canonicalize-defined-colors (list)
    "Copy of LIST with color names canonicalized.

commit 60e25ef3a92a7ebe4bba7bc0f260e61a8af595dd
Author: Evgenii Terechkov <ev...@al...>
Date:   Wed Apr 28 17:03:14 2010 +0800

    Ignore all errors in shell/dbus calls.
    
    Dont show noise errors when emacs started from console session.

diff --git a/jabber-libnotify.el b/jabber-libnotify.el
index 02f4af1..bf4d44c 100644
--- a/jabber-libnotify.el
+++ b/jabber-libnotify.el
@@ -91,7 +91,8 @@
            ':string (encode-coding-string body 'utf-8)
            '(:array)
            '(:array :signature "{sv}")
-           ':int32 jabber-libnotify-timeout))))))
+           ':int32 jabber-libnotify-timeout)))
+      (error nil))))
 
 (define-jabber-alert libnotify "Show a message through the libnotify interface"
   'jabber-libnotify-message)

commit 583d31943d14f09e4364ca71d75e4ccc3bce7f7d
Author: Evgenii Terechkov <ev...@al...>
Date:   Mon Apr 26 15:34:13 2010 +0800

    Suppres "Invalid timer" error when jabber-keepalive-timeout-timer is nil by some reason.
    
    TBD: trace why jabber-keepalive-timeout-timer is nil sometimes.

diff --git a/jabber-keepalive.el b/jabber-keepalive.el
index d4f221f..7c424c1 100644
--- a/jabber-keepalive.el
+++ b/jabber-keepalive.el
@@ -105,7 +105,7 @@ for all accounts regardless of the argument."
 	     (current-time-string)
 	     (plist-get (fsm-get-state-data jc) :server)))
   (setq jabber-keepalive-pending (remq jc jabber-keepalive-pending))
-  (when (null jabber-keepalive-pending)
+  (when (and (null jabber-keepalive-pending) (timerp jabber-keepalive-timeout-timer))
     (jabber-cancel-timer jabber-keepalive-timeout-timer)
     (setq jabber-keepalive-timeout-timer nil)))
 

commit 1f38235feae68176925656f824c056153d5c2d1f
Author: Evgenii Terechkov <ev...@al...>
Date:   Thu Apr 22 15:12:16 2010 +0800

    Dont save undo history in chat buffers.

diff --git a/jabber-chatbuffer.el b/jabber-chatbuffer.el
index 53bba3c..2ea9119 100644
--- a/jabber-chatbuffer.el
+++ b/jabber-chatbuffer.el
@@ -55,7 +55,8 @@ window or at `fill-column', whichever is shorter."
   (make-local-variable 'scroll-conservatively)
   (make-local-variable 'jabber-point-insert)
   (make-local-variable 'jabber-chat-ewoc)
-
+  (make-local-variable 'buffer-undo-list)
+  
   (setq jabber-buffer-connection jc
         scroll-conservatively 5
         buffer-undo-list t)             ;dont keep undo list for chatbuffer

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

Summary of changes:
 Makefile.am          |    1 +
 compat/hexrgb.el     |    1 +
 jabber-chatbuffer.el |    3 ++-
 jabber-keepalive.el  |    2 +-
 jabber-libnotify.el  |    3 ++-
 5 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
emacs-jabber