merge trunk

2 files changed, 6 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4f3f386310a..5765bea74ae 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+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
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.");