procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from emacs-23 branch.

Browse source
This commit is contained in:
Juanma Barranquero 2010-10-08 12:14:47 +02:00
commit 4628bef1ee
34 changed files with 496 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib-src/emacsclient.c
View file

@ -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",