bug#6647: 23.2; display-time-world not alists

[Kevin Ryde]

The docstrings of display-time-world-list say "Alist" whereas if I'm not
mistaken the entries are lists, not pairs.  Perhaps the docstrings could
say just "list" so nobody tries to add to them as an alist.  (Doing so
causes an error from M-x display-time-world.)

2010-07-16  Kevin Ryde  <user42@zip.com.au>

        * time.el (zoneinfo-style-world-list, legacy-style-world-list,
        display-time-world-list): In the docstrings say plain "list" not
        alist, as the list elements are not pairs (but lists).
        (display-time-world-display): Rename parameter from `alist' to
        `world-list' as it's not an alist as such.

--- time.el.~1.117.~    2009-10-08 11:00:20.000000000 +1100
+++ time.el     2010-07-14 18:38:15.000000000 +1000
@@ -123,7 +123,7 @@
     ("Europe/Paris" "Paris")
     ("Asia/Calcutta" "Bangalore")
     ("Asia/Tokyo" "Tokyo"))
-  "Alist of zoneinfo-style time zones and places for `display-time-world'.
+  "List of zoneinfo-style time zones and places for `display-time-world'.
 Each element has the form (TIMEZONE LABEL).
 TIMEZONE should be a string of the form AREA/LOCATION, where AREA is
 the name of a region -- a continent or ocean, and LOCATION is the name
@@ -140,7 +140,7 @@
     ("CET-1CDT" "Paris")
     ("IST-5:30" "Bangalore")
     ("JST-9" "Tokyo"))
-  "Alist of traditional-style time zones and places for `display-time-world'.
+  "List of traditional-style time zones and places for `display-time-world'.
 Each element has the form (TIMEZONE LABEL).
 TIMEZONE should be a string of the form:
 
@@ -165,7 +165,7 @@
     (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.
+  "List 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
 your system.  See the documentation of `zoneinfo-style-world-list' and
@@ -500,15 +500,15 @@
    mode-name "World clock")
   (use-local-map display-time-world-mode-map))
 
-(defun display-time-world-display (alist)
-  "Replace current buffer text with times in various zones, based on ALIST."
+(defun display-time-world-display (world-list)
+  "Replace current buffer text with times in various zones, based on 
WORLD-LIST."
   (let ((inhibit-read-only t)
        (buffer-undo-list t))
     (erase-buffer)
     (let ((max-width 0)
          (result ()))
       (unwind-protect
-         (dolist (zone alist)
+         (dolist (zone world-list)
            (let* ((label (cadr zone))
                   (width (string-width label)))
              (set-time-zone-rule (car zone))


In GNU Emacs 23.2.1 (i486-pc-linux-gnu, GTK+ Version 2.20.0)
 of 2010-05-16 on raven, modified by Debian
configured using `configure  '--build' 'i486-linux-gnu' '--build' 
'i486-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' 
'--libexecdir=/usr/lib' '--localstatedir=/var/lib' '--infodir=/usr/share/info' 
'--mandir=/usr/share/man' '--with-pop=yes' 
'--enable-locallisppath=/etc/emacs23:/etc/emacs:/usr/local/share/emacs/23.2/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/23.2/site-lisp:/usr/share/emacs/site-lisp:/usr/share/emacs/23.2/leim'
 '--with-x=yes' '--with-x-toolkit=gtk' '--with-toolkit-scroll-bars' 
'build_alias=i486-linux-gnu' 'CFLAGS=-DDEBIAN -g -O2' 'LDFLAGS=-g' 'CPPFLAGS=''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_AU
  value of $XMODIFIERS: nil
  locale-coding-system: iso-latin-1-unix
  default enable-multibyte-characters: t