[Emacs-diffs] Changes to emacs/lisp/time.el,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   07/10/30 21:24:58

Index: time.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/time.el,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- time.el     27 Oct 2007 14:53:19 -0000      1.99
+++ time.el     30 Oct 2007 21:24:57 -0000      1.100
@@ -150,9 +150,17 @@
   :version "23.1")
 
 (defcustom display-time-world-list
-  (if (memq 'system-type '(gnu/linux ms-dos))
-      zoneinfo-style-world-list
-    legacy-style-world-list)
+  ;; Determine if zoneinfo style timezones are supported by testing that
+  ;; America/New York and Europe/London return different timezones.
+  (let (gmt nyt)
+    (set-time-zone-rule "America/New York")
+    (setq nyt (format-time-string "%z"))
+    (set-time-zone-rule "Europe/London")
+    (setq gmt (format-time-string "%z"))
+    (set-time-zone-rule nil)
+    (if (string-equal nyt gmt)
+        legacy-style-world-list
+      zoneinfo-style-world-list))
   "Alist of time zones and places for `display-time-world' to display.
 Each element has the form (TIMEZONE LABEL).
 TIMEZONE should be in the format supported by `set-time-zone-rule' on