From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 8 Aug 2024 06:05:52 +0000 (-0700)
Subject: Port zoneinfo-world-style-list to Debian testing
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7b613c59b961f23588c85dd97e51163020c728e;p=emacs.git

Port zoneinfo-world-style-list to Debian testing

Problem reported by Gijs Hillenius <gijs@hillenius.net> in:
https://lists.gnu.org/r/emacs-devel/2024-08/msg00279.html
* lisp/time.el (zoneinfo-style-world-list): Use Asia/Kolkata
instead of Asia/Calcutta.  The main name was changed in tzdata
2008b every practical system has it now.  Some systems do
not include backward-compatibility names, so it is better
to use the standard time now.

(cherry picked from commit 9464a1d3860f700dced23ae8d8d2b37e277a2382)
---

diff --git a/lisp/time.el b/lisp/time.el
index 02007d890cb..47d6b4a705d 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -452,7 +452,7 @@ runs the normal hook `display-time-hook' after each update."
     ("America/New_York" "New York")
     ("Europe/London" "London")
     ("Europe/Paris" "Paris")
-    ("Asia/Calcutta" "Bangalore")
+    ("Asia/Kolkata" "Bangalore")
     ("Asia/Tokyo" "Tokyo"))
   "Alist of zoneinfo-style time zones and places for `world-clock'.
 Each element has the form (TIMEZONE LABEL).