(twittering-format-status): call 'twittering-make-display-spec-for-ic…

…on' only when 'window-system' is non-nil to avoid error "Non-X frame used" under Emacs which is using a text-only terminal.
hayamiz · Jan 25, 2010 · 7111be2 · 7111be2
1 parent de19e8f
commit 7111be2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-25  Satoshi Yatagawa  <yata_github@y.hauN.org>
+
+	* twittering-mode.el (twittering-format-status): Call
+	`twittering-make-display-spec-for-icon' only when `window-system'
+	is non-nil to avoid error "Non-X frame used" under Emacs which is
+	using a text-only terminal.
+
 2010-01-23  Naohiro Aota  <naota@elisp.net>
 
 	* twittering-mode.el (twittering-home-timeline): Add new funciton.

diff --git a/twittering-mode.el b/twittering-mode.el
@@ -1997,7 +1997,8 @@ variable `twittering-status-format'"
 		     twittering-image-data-table)
 	      (add-to-list 'twittering-image-stack profile-image-url))
 
-	    (when (and icon-string twittering-icon-mode)
+	    (when (and twittering-icon-mode window-system
+		       icon-string)
 	      (let ((display-spec
 		     (twittering-make-display-spec-for-icon profile-image-url)))
 		(when display-spec