X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=emacs.el;h=38d2575014d3a1143c8b7330764ec35c4007f287;hb=55327bbf092e7ea9cd719ac6e7cdaa116b749cde;hp=1b17d1bc2f6787d7f2c60240f538fd63031cea05;hpb=be47b541dee450d8a2ea822ef1056ddcd8f09f03;p=elisp.git

diff --git a/emacs.el b/emacs.el
index 1b17d1b..38d2575 100644
--- a/emacs.el
+++ b/emacs.el
@@ -974,27 +974,31 @@ printer."
 
  display-time-string-forms `(
 
-                             load " "
+                             load
 
-                                  (ff/temp-info-string)
+                             " "
 
-                                  (propertize
-                                   (ff/battery-info-string)
-                                   'face 'ff/battery-info-face)
+                             ,@(when (ff/battery-info-string)
+                                 '((ff/temp-info-string)))
 
-                                  " "
+                             ,@(when (ff/battery-info-string)
+                                 '((propertize
+                                    (ff/battery-info-string)
+                                    'face 'ff/battery-info-face)))
 
-                                  (propertize
-                                   (concat ;;" ˌ"
-                                    24-hours ":" minutes
-                                    " "
-                                    ;; dayname " "
-                                    monthname " " day
-                                    ;;"ˌ"
-                                    )
-                                   'face 'ff/date-info-face)
+                             " "
 
-                                  )
+                             (propertize
+                              (concat ;;" ˌ"
+                               24-hours ":" minutes
+                               " "
+                               ;; dayname " "
+                               monthname " " day
+                               ;;"ˌ"
+                               )
+                              'face 'ff/date-info-face)
+
+                             )
 
  ;; display-time-format "%b %a %e %H:%M"
  ;; display-time-mail-face nil