diff options
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 571f98b8a8d..e3232a46f3c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2012-06-24 Samuel Bronson <naesten@gmail.com> (tiny change) + + * emacsclient.c (set_local_socket): Fix compiler warning (Bug#7838). + 2012-06-22 Paul Eggert <eggert@cs.ucla.edu> Support higher-resolution time stamps (Bug#9000). diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 29504445407..f8e81256101 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1278,7 +1278,7 @@ set_local_socket (const char *local_socket_name) if (n > 0) { tmpdir = tmpdir_storage = xmalloc (n); - confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n); + confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir_storage, n); } else #endif |