merge emacs-23

3 files changed, 9 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 11da74f63b0..ba98132521d 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * emacsclient.c (set_local_socket) [DARWIN_OS]: Add fall-back
+        definition of _CS_DARWIN_USER_TEMP_DIR for Mac OS X 10.4 and older.
+
 2010-10-01  Glenn Morris  <rgm@gnu.org>
 
         * emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 05f01b3b097..4b45beb6901 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1251,6 +1251,9 @@ set_local_socket ()
         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)
               {
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 601d412894e..1a0def1e304 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
-VERSION         = 23.2.50
+VERSION         = 23.2.90
 
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \