[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100075: Close bug#3992.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100075: Close bug#3992. |
Date: |
Thu, 30 Sep 2010 20:41:12 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100075
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-09-30 20:41:12 -0700
message:
Close bug#3992.
* lib-src/emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
DARWIN_USER_TEMP_DIR.
modified:
lib-src/ChangeLog
lib-src/emacsclient.c
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-05-08 03:28:26 +0000
+++ b/lib-src/ChangeLog 2010-10-01 03:41:12 +0000
@@ -1,3 +1,8 @@
+2010-10-01 Glenn Morris <address@hidden>
+
+ * emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
+ DARWIN_USER_TEMP_DIR. (Bug#3992)
+
2010-05-07 Chong Yidong <address@hidden>
* Version 23.2 released.
=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c 2010-01-13 15:38:28 +0000
+++ b/lib-src/emacsclient.c 2010-10-01 03:41:12 +0000
@@ -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",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100075: Close bug#3992.,
Glenn Morris <=