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

[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  dd049eb4b50424b87b77ecac907d11397eaa4071 (commit)
      from  370a75193c6dbff4ded885261e196f396d05bf8c (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 dd049eb4b50424b87b77ecac907d11397eaa4071
Author: Magnus Henoch <mag...@gm...>
Date:   Fri Jan 10 14:46:25 2014 +0000

    Handle frame-title-format and icon-title-format being t
    
    How has this not caused any problems before?..

diff --git a/jabber-activity.el b/jabber-activity.el
index 9f4bec9..131835b 100644
--- a/jabber-activity.el
+++ b/jabber-activity.el
@@ -387,13 +387,13 @@ With a numeric arg, enable this display if arg is positive."
 	  ;; included twice in the title.  I'm not sure exactly why,
 	  ;; but it would be nice to replace the code below with
 	  ;; something cleaner.
-	  (if (equal (car frame-title-format) "")
+	  (if (equal (car-safe frame-title-format) "")
 	      (add-to-list 'frame-title-format
 			   jabber-activity-count-in-title-format)
 	    (setq frame-title-format (list ""
 					   jabber-activity-count-in-title-format
 					   frame-title-format)))
-	  (if (equal (car icon-title-format) "")
+	  (if (equal (car-safe icon-title-format) "")
 	      (add-to-list 'icon-title-format
 			 jabber-activity-count-in-title-format)
 	    (setq icon-title-format (list ""

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

Summary of changes:
 jabber-activity.el |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
emacs-jabber