diff options
| author | Jason Rumney <jasonr@gnu.org> | 2007-06-07 21:37:14 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2007-06-07 21:37:14 +0000 |
| commit | 8bf3affd8f539fb16a1b4bda9144df9709368a4c (patch) | |
| tree | d6287ab7ef98aa30dc1bc6151755a1f1bb5232b1 /src/editfns.c | |
| parent | 96c5f3bc3ca261de9caaca8e50b0491fa9d58bd6 (diff) | |
| download | emacs-8bf3affd8f539fb16a1b4bda9144df9709368a4c.tar.gz | |
(Fcurrent_time_zone): Remove hack for Japanese Windows.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/editfns.c b/src/editfns.c index 37498e3b6f7..2f759a38dd0 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1974,6 +1974,7 @@ the data it can't find. */) 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 @@ the data it can't find. */) #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 @@ the data it can't find. */) sprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60, am%60); s = buf; } + return Fcons (make_number (offset), Fcons (build_string (s), Qnil)); } else |