Merge changes from emacs-23 branch.

2 files changed, 17 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6d5bf6c4e5b..50528a4508c 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-08  Glenn Morris  <rgm@gnu.org>
+
+        * emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
+        DARWIN_USER_TEMP_DIR.  (Bug#3992)
+
 2010-10-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * test-distrib.c (cool_read):
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index b20710e110c..b60b2661805 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1223,7 +1223,18 @@ set_local_socket (void)
       {
         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",