diff options
| author | Paul Eggert | 2011-10-13 08:23:32 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-13 08:23:32 -0700 |
| commit | ef0f0304040ee5e0ba503baa77109c99ce54e367 (patch) | |
| tree | cf9959c2078d01cf23cde7923f306c59676a46a2 /src/editfns.c | |
| parent | 7ebd31ee0740d85527a498100d1f14dad5e0350f (diff) | |
| parent | 81d40c920807279ccc0dae0aca46c8291755c66d (diff) | |
| download | emacs-ef0f0304040ee5e0ba503baa77109c99ce54e367.tar.gz emacs-ef0f0304040ee5e0ba503baa77109c99ce54e367.zip | |
Merge from trunk.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/editfns.c b/src/editfns.c index 8489a47649e..48b601860ca 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -2069,7 +2069,7 @@ only the former. */) | |||
| 2069 | } | 2069 | } |
| 2070 | 2070 | ||
| 2071 | set_time_zone_rule (tzstring); | 2071 | set_time_zone_rule (tzstring); |
| 2072 | free (environbuf); | 2072 | xfree (environbuf); |
| 2073 | environbuf = environ; | 2073 | environbuf = environ; |
| 2074 | 2074 | ||
| 2075 | return Qnil; | 2075 | return Qnil; |