Merge changes from emacs-23 branch.

[gnu-emacs] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6d5bf6c4e5b2db6f66f9a3f79a516d3520231328..50528a4508c47bf15b3f1cc9a405d50217fdfb48 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-08  Glenn Morris  <rgm@gnu.org>
+
+       * emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
+       DARWIN_USER_TEMP_DIR.  (Bug#3992)
+
 2010-10-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * test-distrib.c (cool_read):