Merge from trunk

1 files changed, 16 insertions, 5 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4f3f386310a..2c386257c10 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,8 +1,19 @@
+2010-09-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (../src/config.h): Remove target, it is stale.
+
+        * emacsclient.c (main): Remove unused variables.
+        (start_daemon_and_retry_set_socket): Use EXIT_FAILURE.
+
+2010-09-25  Ulrich Mueller  <ulm@gentoo.org>
+
+        * etags.c (compressors, print_language_names): Support xz compression.
+
 2010-08-11  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * fakemail.c: Include stdlib.h for getenv. Remove declaration of
+        * fakemail.c: Include stdlib.h for getenv.  Remove declaration of
         popen, fclose and pclose.
-        (my_name, fatal, error, put_line): Use const char*
+        (my_name, fatal, error, put_line): Use const char*.
         (main): Remove extern getenv, mail_program_name is const char*.
 
         * update-game-score.c (get_prefix, write_scores, main): Use const char*.
@@ -12,7 +23,7 @@
         * pop.h (pop_multi_first): Use const char *.
         (_ARGS): Remove.
 
-        * pop.c (pop_multi_first, socket_connection, sendline): Use conat char*.
+        * pop.c (pop_multi_first, socket_connection, sendline): Use const char*.
 
         * movemail.c (fatal, error, concat): Use const char *.
 
@@ -57,7 +68,7 @@
 2010-08-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * emacsclient.c: Move socket related #includes together with the
-        rest of the #includes.  Move a WINDOWSNT includes closer together.
+        rest of the #includes.  Move WINDOWSNT includes closer together.
         (HAVE_CONFIG_H): Remove.
         (NO_RETURN): Remove, defined in config.h.
         (main): Convert definition to standard C.
@@ -160,7 +171,7 @@
         (fatal): Make static.
         (error): Likewise.
         (pfatal_with_name): Likewise.
-        (pfatal_and_delete). Likewise.
+        (pfatal_and_delete): Likewise.
         (concat): Likewise.
         (xmalloc): Likewise.
         (popmail): Likewise.