Mercurial > hg > xemacs-beta
diff src/editfns.c @ 4985:358aa3bb603f
Automatic merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 12:12:28 -0600 |
| parents | 3c3c1d139863 |
| children | 1537701f08a1 |
line wrap: on
line diff
--- a/src/editfns.c Fri Feb 05 12:11:12 2010 -0600 +++ b/src/editfns.c Fri Feb 05 12:12:28 2010 -0600 @@ -1068,14 +1068,14 @@ Extbyte *buf = alloca_extbytes (size); Extbyte *formext; /* make a copy of the static buffer returned by localtime() */ - struct tm tm = * localtime(&value); + struct tm tm = *localtime (&value); *buf = 1; /* !!#### this use of external here is not totally safe, and potentially data lossy. */ - LISP_STRING_TO_EXTERNAL (format_string, formext, - Qtime_function_encoding); + formext = LISP_STRING_TO_EXTERNAL (format_string, + Qtime_function_encoding); if (emacs_strftime (buf, size, formext, &tm) || !*buf) return build_extstring (buf, Qtime_function_encoding); @@ -1188,7 +1188,7 @@ Extbyte **oldenv = environ, **newenv; if (STRINGP (zone)) - LISP_STRING_TO_EXTERNAL (zone, tzstring, Qtime_zone_encoding); + tzstring = LISP_STRING_TO_EXTERNAL (zone, Qtime_zone_encoding); else if (INTP (zone)) { int abszone = abs (XINT (zone)); @@ -1434,7 +1434,7 @@ else { CHECK_STRING (tz); - LISP_STRING_TO_EXTERNAL (tz, tzstring, Qtime_zone_encoding); + tzstring = LISP_STRING_TO_EXTERNAL (tz, Qtime_zone_encoding); } set_time_zone_rule (tzstring);