Mercurial > emacs
comparison lisp/time.el @ 85689:f72f7930bbb5
(zoneinfo-style-world-list, legacy-style-world-list): New defcustoms.
(display-time-world-list): Use them as appropriate for the current value
of `system-type'.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 12:43:07 +0000 |
parents | e7618e76351a |
children | 93072a4b7046 |
comparison
equal
deleted
inserted
replaced
85688:b210bba3f477 | 85689:f72f7930bbb5 |
---|---|
110 | 110 |
111 (defvar display-time-server-down-time nil | 111 (defvar display-time-server-down-time nil |
112 "Time when mail file's file system was recorded to be down. | 112 "Time when mail file's file system was recorded to be down. |
113 If that file system seems to be up, the value is nil.") | 113 If that file system seems to be up, the value is nil.") |
114 | 114 |
115 (defcustom display-time-world-list | 115 (defcustom zoneinfo-style-world-list |
116 '(("America/Los_Angeles" "Seattle") | 116 '(("America/Los_Angeles" "Seattle") |
117 ("America/New_York" "New York") | 117 ("America/New_York" "New York") |
118 ("Europe/London" "London") | 118 ("Europe/London" "London") |
119 ("Europe/Paris" "Paris") | 119 ("Europe/Paris" "Paris") |
120 ("Asia/Calcutta" "Bangalore") | 120 ("Asia/Calcutta" "Bangalore") |
121 ("Asia/Tokyo" "Tokyo")) | 121 ("Asia/Tokyo" "Tokyo")) |
122 "Alist specifying time zones and places for `display-time-world'. | 122 "Alist of zoneinfo-style time zones and places for `display-time-world'. |
123 Each element has the form (TIMEZONE LABEL). | 123 Each element has the form (TIMEZONE LABEL). |
124 TIMEZONE should be a valid argument for `set-time-zone-rule'. | 124 TIMEZONE should be a string of the form AREA/LOCATION, where AREA is |
125 LABEL is a string to display to label that zone's time." | 125 the name of a region -- a continent or ocean, and LOCATION is the name |
126 of a specific location, e.g., a city, within that region. | |
127 LABEL is a string to display as the label of that TIMEZONE's time." | |
128 :group 'display-time | |
129 :type '(repeat (list string string)) | |
130 :version "23.1") | |
131 | |
132 (defcustom legacy-style-world-list | |
133 '(("PST8PDT" "Seattle") | |
134 ("EST5EDT" "New York") | |
135 ("BST0BDT" "London") | |
136 ("CET-1CDT" "Paris") | |
137 ("IST-5:30IDT" "Bangalore") | |
138 ("JST-9JDT" "Tokyo")) | |
139 "Alist of traditional-style time zones and places for `display-time-world'. | |
140 Each element has the form (TIMEZONE LABEL). | |
141 TIMEZONE should be a string of the form: | |
142 | |
143 std[+|-]offset[dst[offset][,date[/time],date[/time]]] | |
144 | |
145 See the documentation of the TZ environment variable on your system, | |
146 for more details about the format of TIMEZONE. | |
147 LABEL is a string to display as the label of that TIMEZONE's time." | |
148 :group 'display-time | |
149 :type '(repeat (list string string)) | |
150 :version "23.1") | |
151 | |
152 (defcustom display-time-world-list | |
153 (if (memq 'system-type '(gnu/linux ms-dos)) | |
154 zoneinfo-style-world-list | |
155 legacy-style-world-list) | |
156 "Alist of time zones and places for `display-time-world' to display. | |
157 Each element has the form (TIMEZONE LABEL). | |
158 TIMEZONE should be in the format supported by `set-time-zone-rule' on | |
159 your system. See the documentation of `zoneinfo-style-world-list' and | |
160 \`legacy-style-world-list' for two widely used formats. | |
161 LABEL is a string to display as the label of that TIMEZONE's time." | |
126 :group 'display-time | 162 :group 'display-time |
127 :type '(repeat (list string string)) | 163 :type '(repeat (list string string)) |
128 :version "23.1") | 164 :version "23.1") |
129 | 165 |
130 (defcustom display-time-world-time-format "%A %d %B %R %Z" | 166 (defcustom display-time-world-time-format "%A %d %B %R %Z" |