# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1181252234 0
# Node ID d2bd034ded2731a23f15db3c8eca026b817ab555
# Parent  d76b11a64956307f9718f3da1a9bd3e9d42461fe
(Fcurrent_time_zone): Remove hack for Japanese Windows.

diff -r d76b11a64956 -r d2bd034ded27 src/editfns.c
--- 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