Mercurial > emacs
changeset 81259:d2bd034ded27
(Fcurrent_time_zone): Remove hack for Japanese Windows.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Thu, 07 Jun 2007 21:37:14 +0000 |
| parents | d76b11a64956 |
| children | 31e8b2cee369 |
| files | src/editfns.c |
| diffstat | 1 files changed, 2 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/editfns.c Thu Jun 07 21:36:48 2007 +0000 +++ b/src/editfns.c Thu Jun 07 21:37:14 2007 +0000 @@ -1974,6 +1974,7 @@ int offset = tm_diff (t, &gmt); char *s = 0; char buf[6]; + #ifdef HAVE_TM_ZONE if (t->tm_zone) s = (char *)t->tm_zone; @@ -1984,19 +1985,6 @@ #endif #endif /* not HAVE_TM_ZONE */ -#if defined HAVE_TM_ZONE || defined HAVE_TZNAME - if (s) - { - /* On Japanese w32, we can get a Japanese string as time - zone name. Don't accept that. */ - char *p; - for (p = s; *p && (isalnum ((unsigned char)*p) || *p == ' '); ++p) - ; - if (p == s || *p) - s = NULL; - } -#endif - if (!s) { /* No local time zone name is available; use "+-NNNN" instead. */ @@ -2004,6 +1992,7 @@ sprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60, am%60); s = buf; } + return Fcons (make_number (offset), Fcons (build_string (s), Qnil)); } else