Fixed an ugly bug when there are encoding problems with the ICE media infos.

[elisp.git] / emacs.el

diff --git a/emacs.el b/emacs.el
index cad17c1..ac9782c 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -31,9 +31,9 @@
 ;; Xft.antialias: true
 ;; Xft.rgba: rgb
 
-(set-default-font "Inconsolata 15")
+;; (set-default-font "Inconsolata 15")
 
-;; (set-default-font "Bitstream vera sans mono-12")
+(set-default-font "Bitstream vera sans mono-12")
 ;; (set-default-font "Liberation Mono-13")
 ;; (set-default-font "DejaVu sans mono 15")
 ;; (set-default-font "Droid sans mono 13")
@@ -962,7 +962,7 @@ printer."
 
                              " "
 
-                             ,@(when (ff/battery-info-string)
+                             ,@(when (ff/temp-info-string)
                                  '((ff/temp-info-string)))
 
                              ,@(when (ff/battery-info-string)