aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src/emacsclient.c
diff options
context:
space:
mode:
authorGlenn Morris2010-09-30 20:41:12 -0700
committerGlenn Morris2010-09-30 20:41:12 -0700
commitb336bfcdf39f1e4d35bff4a7bd01d3b4bca8f516 (patch)
treeb85d2eaec61b0af7955fe9c9289ca447fbe1d66c /lib-src/emacsclient.c
parent55586d2a88c1273958893da1e17979a3e7a89691 (diff)
downloademacs-b336bfcdf39f1e4d35bff4a7bd01d3b4bca8f516.tar.gz
emacs-b336bfcdf39f1e4d35bff4a7bd01d3b4bca8f516.zip
Close bug#3992.
* lib-src/emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back DARWIN_USER_TEMP_DIR.
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r--lib-src/emacsclient.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 01241b518bb..05f01b3b097 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1249,7 +1249,18 @@ set_local_socket ()
1249 { 1249 {
1250 tmpdir = egetenv ("TMPDIR"); 1250 tmpdir = egetenv ("TMPDIR");
1251 if (!tmpdir) 1251 if (!tmpdir)
1252 tmpdir = "/tmp"; 1252 {
1253#ifdef DARWIN_OS
1254 size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
1255 if (n > 0)
1256 {
1257 tmpdir = alloca (n);
1258 confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n);
1259 }
1260 else
1261#endif
1262 tmpdir = "/tmp";
1263 }
1253 socket_name = alloca (strlen (tmpdir) + strlen (server_name) 1264 socket_name = alloca (strlen (tmpdir) + strlen (server_name)
1254 + EXTRA_SPACE); 1265 + EXTRA_SPACE);
1255 sprintf (socket_name, "%s/emacs%d/%s", 1266 sprintf (socket_name, "%s/emacs%d/%s",