Merge from emacs-23

This commit is contained in:
Stefan Monnier 2010-11-17 22:54:14 -05:00
commit 4a47c27573
38 changed files with 449 additions and 171 deletions

View file

@ -1225,6 +1225,9 @@ set_local_socket (void)
if (!tmpdir)
{
#ifdef DARWIN_OS
#ifndef _CS_DARWIN_USER_TEMP_DIR
#define _CS_DARWIN_USER_TEMP_DIR 65537
#endif
size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
if (n > 0)
{