Mercurial > emacs
changeset 92954:f0f1c359cd43
(initial_tz): New variable.
(syms_of_editfns): Initialize it.
(Fset_time_zone_rule): Set it when first called.
Use it when TZSTRING is nil.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Fri, 14 Mar 2008 23:36:58 +0000 |
| parents | 21d63c870839 |
| children | 35b7a4096c03 |
| files | src/editfns.c |
| diffstat | 1 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/editfns.c Fri Mar 14 21:32:47 2008 +0000 +++ b/src/editfns.c Fri Mar 14 23:36:58 2008 +0000 @@ -2011,6 +2011,11 @@ has never been called. */ static char **environbuf; +/* This holds the startup value of the TZ environment variable so it + can be restored if the user calls set-time-zone-rule with a nil + argument. */ +static char *initial_tz; + DEFUN ("set-time-zone-rule", Fset_time_zone_rule, Sset_time_zone_rule, 1, 1, 0, doc: /* Set the local time zone using TZ, a string specifying a time zone rule. If TZ is nil, use implementation-defined default time zone information. @@ -2020,8 +2025,12 @@ { char *tzstring; + /* When called for the first time, save the original TZ. */ + if (!environbuf) + initial_tz = (char *) getenv ("TZ"); + if (NILP (tz)) - tzstring = 0; + tzstring = initial_tz; else if (EQ (tz, Qt)) tzstring = "UTC0"; else @@ -4588,6 +4597,7 @@ syms_of_editfns () { environbuf = 0; + initial_tz = 0; Qbuffer_access_fontify_functions = intern ("buffer-access-fontify-functions");