# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1285904472 25200
# Node ID 5481007b7ce9cb8b4a1a568915abc21193c13c5a
# Parent  0eedefa853ee35e2a14a9163704a77855c43962f
Close bug#3992.

* lib-src/emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
DARWIN_USER_TEMP_DIR.

diff -r 0eedefa853ee -r 5481007b7ce9 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Fri Oct 01 01:05:26 2010 +0200
+++ b/lib-src/ChangeLog	Thu Sep 30 20:41:12 2010 -0700
@@ -1,3 +1,8 @@
+2010-10-01  Glenn Morris  <rgm@gnu.org>
+
+	* emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
+	DARWIN_USER_TEMP_DIR.  (Bug#3992)
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Version 23.2 released.
diff -r 0eedefa853ee -r 5481007b7ce9 lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Fri Oct 01 01:05:26 2010 +0200
+++ b/lib-src/emacsclient.c	Thu Sep 30 20:41:12 2010 -0700
@@ -1249,7 +1249,18 @@
       {
 	tmpdir = egetenv ("TMPDIR");
 	if (!tmpdir)
-	  tmpdir = "/tmp";
+          {
+#ifdef DARWIN_OS
+            size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
+            if (n > 0)
+              {
+                tmpdir = alloca (n);
+                confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n);
+              }
+            else
+#endif
+              tmpdir = "/tmp";
+          }
 	socket_name = alloca (strlen (tmpdir) + strlen (server_name)
 			      + EXTRA_SPACE);
 	sprintf (socket_name, "%s/emacs%d/%s",