aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-01-11 17:15:06 -0800
committerPaul Eggert2013-01-11 17:15:06 -0800
commitee56a6dc2f54025c7926cb8cbb6974f51d7e0a19 (patch)
treeaa8e907a99270a0897427c9814e9f642b099a575 /src
parent002b843312aa23a3804028314c313e14f0039993 (diff)
downloademacs-ee56a6dc2f54025c7926cb8cbb6974f51d7e0a19.tar.gz
emacs-ee56a6dc2f54025c7926cb8cbb6974f51d7e0a19.zip
Fix bug with set-time-zone-rule and LOCALTIME_CACHE.
* editfns.c (set_time_zone_rule) [LOCALTIME_CACHE]: Clear tzvalbuf_in_environ if this workaround is in effect. Problem and fix reported by Kazuhiro Ito. Fixes: debbugs:13415
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/editfns.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 01862b689f8..2481177f465 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12013-01-12 Paul Eggert <eggert@cs.ucla.edu>
2
3 Fix bug with set-time-zone-rule and LOCALTIME_CACHE (Bug#13415).
4 * editfns.c (set_time_zone_rule) [LOCALTIME_CACHE]:
5 Clear tzvalbuf_in_environ if this workaround is in effect.
6 Problem and fix reported by Kazuhiro Ito.
7
12013-01-11 Aaron S. Hawley <Aaron.Hawley@vtinfo.com> 82013-01-11 Aaron S. Hawley <Aaron.Hawley@vtinfo.com>
2 9
3 * insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix 10 * insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix
diff --git a/src/editfns.c b/src/editfns.c
index 64269bab8df..bf19acb42a8 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2188,6 +2188,7 @@ set_time_zone_rule (const char *tzstring)
2188 xputenv (set_time_zone_rule_tz[1]); 2188 xputenv (set_time_zone_rule_tz[1]);
2189 } 2189 }
2190 tzset (); 2190 tzset ();
2191 tzvalbuf_in_environ = 0;
2191#endif 2192#endif
2192 2193
2193 if (!tzstring) 2194 if (!tzstring)