1 files changed, 9 insertions, 0 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 54a39fb4d0a..92d9411189e 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -549,6 +549,15 @@ main (argc, argv, envp)
 
   initialized = 1;
 
+#ifdef sun
+  /* sun's localtime() has a bug.  it caches the value of the time
+     zone rather than looking it up every time.  Since localtime() is
+     called to bolt the undumping time into the undumped emacs, this
+     results in localtime() ignoring the TZ environment variable.
+     This flushes the new TZ value into localtime(). */
+  tzset();
+#endif /* sun */
+
   /* Enter editor command loop.  This never returns.  */
   Frecursive_edit ();
   /* NOTREACHED */