From 8bf3affd8f539fb16a1b4bda9144df9709368a4c Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Thu, 7 Jun 2007 21:37:14 +0000 Subject: (Fcurrent_time_zone): Remove hack for Japanese Windows. --- src/editfns.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/editfns.c') 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 -- cgit v1.2.1 From 23f77bc2fd6fcc469fd7d8352f04aca6030280e6 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 8 Jun 2007 20:14:30 +0000 Subject: (Fdelete_and_extract_region): Use empty_unibyte_string. --- src/editfns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/editfns.c') diff --git a/src/editfns.c b/src/editfns.c index 2f759a38dd0..aca3383943d 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3031,7 +3031,7 @@ DEFUN ("delete-and-extract-region", Fdelete_and_extract_region, { validate_region (&start, &end); if (XINT (start) == XINT (end)) - return build_string (""); + return empty_unibyte_string; return del_range_1 (XINT (start), XINT (end), 1, 1); } -- cgit v1.2.1