aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-10-12 13:36:49 -0700
committerPaul Eggert2014-10-12 13:36:49 -0700
commitec11ab9b783fc1f2c0ce858a711baa5f728c238b (patch)
tree0680c83abfa330e866267c3ee5ca4f1a1e7c50f9 /src
parentcc541e588a000c9aa6f4d732e95b67e2f01433d6 (diff)
downloademacs-ec11ab9b783fc1f2c0ce858a711baa5f728c238b.tar.gz
emacs-ec11ab9b783fc1f2c0ce858a711baa5f728c238b.zip
* editfns.c (dump_tz_string): No longer const.
It might be modified.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/editfns.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e06406e3af0..b47fb4c9d0f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12014-10-12 Paul Eggert <eggert@cs.ucla.edu> 12014-10-12 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * editfns.c (dump_tz_string): No longer const.
4 It might be modified.
5
3 * nsmenu.m (clear): Assume OS X 10.6 or later. 6 * nsmenu.m (clear): Assume OS X 10.6 or later.
4 7
52014-10-12 Jan Djärv <jan.h.d@swipnet.se> 82014-10-12 Jan Djärv <jan.h.d@swipnet.se>
diff --git a/src/editfns.c b/src/editfns.c
index d17d809c9ec..be1062dbbc5 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -90,7 +90,7 @@ static char const *initial_tz;
90 90
91/* A valid but unlikely setting for the TZ environment variable. 91/* A valid but unlikely setting for the TZ environment variable.
92 It is OK (though a bit slower) if the user chooses this value. */ 92 It is OK (though a bit slower) if the user chooses this value. */
93static char const dump_tz_string[] = "TZ=UtC0"; 93static char dump_tz_string[] = "TZ=UtC0";
94 94
95void 95void
96init_editfns (void) 96init_editfns (void)
@@ -109,7 +109,7 @@ init_editfns (void)
109 if (!initialized) 109 if (!initialized)
110 { 110 {
111# ifdef HAVE_TZSET 111# ifdef HAVE_TZSET
112 xputenv ((char *) dump_tz_string); 112 xputenv (dump_tz_string);
113 tzset (); 113 tzset ();
114# endif 114# endif
115 return; 115 return;