procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Fcurrent_time_zone): Remove hack for Japanese Windows.

Browse source
This commit is contained in:
Jason Rumney 2007-06-07 21:38:10 +00:00
parent 4608d82961
commit 42c4c67a4a
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2007-06-07 Jason Rumney <jasonr@gnu.org>
* s/ms-w32.h: Don't define HAVE_TZNAME.
* editfns.c (Fcurrent_time_zone): Remove hack for Japanese Windows.
2007-06-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* mac.c (xrm_get_preference_database): Remove BLOCK_INPUT.

15
src/editfns.c
View file

@ -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