summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Liu <sdl.web@gmail.com>2011-03-03 21:00:40 -0800
committerGlenn Morris <rgm@gnu.org>2011-03-03 21:00:40 -0800
commitfc0e90924a0621bcf7fd3f1b1251a1b2b5d0a470 (patch)
tree5eb9d9b56aa904fc12d949d0124e870a2bb7e540
parenta65112fb4157116f450c41e5d3ae8e927d3dde39 (diff)
downloademacs-fc0e90924a0621bcf7fd3f1b1251a1b2b5d0a470.tar.gz
* lisp/time.el (display-time-world-list): Fix typo.
Fixes: debbugs:7571
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/time.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7ee203ed91..04710d6bcf1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-04 Leo <sdl.web@gmail.com>
+
+ * time.el (display-time-world-list): Fix typo. (Bug#7571)
+
2011-03-04 Zachary Kanfer <zkanfer@gmail.com> (tiny change)
* cus-edit.el (custom-buffer-create-internal):
diff --git a/lisp/time.el b/lisp/time.el
index 1bc1cca1112..2e9dd252bd6 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -157,7 +157,7 @@ LABEL is a string to display as the label of that TIMEZONE's time."
;; 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")
+ (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"))