4 files changed, 20 insertions, 9 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.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index e8ffbe7c562..1f96c481129 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1476,7 +1476,7 @@ start_daemon_and_retry_set_socket (void)
   else if (dpid < 0)
     {
       fprintf (stderr, "Error: Cannot fork!\n");
-      exit (1);
+      exit (EXIT_FAILURE);
     }
   else
     {
@@ -1576,8 +1576,6 @@ main (int argc, char **argv)
       int i;
       for (i = 0; environ[i]; i++)
         {
-          char *name = xstrdup (environ[i]);
-          char *value = strchr (name, '=');
           send_to_emacs (emacs_socket, "-env ");
           quote_argument (emacs_socket, environ[i]);
           send_to_emacs (emacs_socket, " ");
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 42e4017ab50..abc8b06dd8e 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -561,6 +561,7 @@ static compressor compressors[] =
   { "gz", "gzip -d -c"},
   { "GZ", "gzip -d -c"},
   { "bz2", "bzip2 -d -c" },
+  { "xz", "xz -d -c" },
   { NULL }
 };
 
@@ -874,7 +875,7 @@ followed by the name of an interpreter.  If no such sequence is found,\n\
 Fortran is tried first; if no tags are found, C is tried next.\n\
 When parsing any C file, a \"class\" or \"template\" keyword\n\
 switches to C++.");
-  puts ("Compressed files are supported using gzip and bzip2.\n\
+  puts ("Compressed files are supported using gzip, bzip2, and xz.\n\
 \n\
 For detailed help on a given language use, for example,\n\
 etags --help --lang=ada.");
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 72a04ecff89..552dd1349fc 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -371,6 +371,7 @@ cleanall:	clean
 # Headers we would preprocess if we could.
 #
 ../src/config.h:        ../nt/$(CONFIG_H)
+                        $(DEL) $@
                         echo $(CONFIG_H) has changed.  Re-run configure.bat.
                         exit -1