Merge from emacs-23

[bpt/emacs.git] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e402fe4..d1745a8 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-18  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-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * test-distrib.c: Remove include guards for config.h and fcntl.h.