Mercurial > emacs

changeset 110579:5fabe7db5188

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add more xz compression support. * doc/man/etags.1: xz compression is now supported. * doc/misc/woman.texi (Interface Options): xz compression is now supported. * lib-src/etags.c (compressors, print_language_names): Support xz compression. * lisp/eshell/em-ls.el (eshell-ls-archive-regexp): * lisp/eshell/esh-util.el (eshell-tar-regexp): * lisp/ibuffer.el (ibuffer-compressed-file-name-regexp): * lisp/info.el (Info-suffix-list): * lisp/international/mule.el (auto-coding-alist): * lisp/woman.el (woman-file-regexp, woman-file-compression-regexp): * lisp/progmodes/etags.el (tags-compression-info-list): Support xz compression.
author Glenn Morris <rgm@gnu.org>
date Sat, 25 Sep 2010 14:42:48 -0700
parents 5874484c8de5
children f57f72bb4757
files doc/man/ChangeLog doc/man/etags.1 doc/misc/ChangeLog doc/misc/woman.texi lib-src/ChangeLog lib-src/etags.c lisp/ChangeLog lisp/eshell/em-ls.el lisp/eshell/esh-util.el lisp/ibuffer.el lisp/info.el lisp/international/mule.el lisp/progmodes/etags.el lisp/woman.el
diffstat 14 files changed, 47 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/doc/man/ChangeLog	Sat Sep 25 13:59:05 2010 -0700
+++ b/doc/man/ChangeLog	Sat Sep 25 14:42:48 2010 -0700
@@ -1,3 +1,7 @@
+2010-09-25  Ulrich Mueller  <ulm@gentoo.org>
+
+	* etags.1: xz compression is now supported.
+
 2010-08-26  Sven Joachim  <svenjoac@gmx.de>
 
 	* emacs.1: Mention "maximized" value for the "fullscreen" X resource.
--- a/doc/man/etags.1	Sat Sep 25 13:59:05 2010 -0700
+++ b/doc/man/etags.1	Sat Sep 25 14:42:48 2010 -0700
@@ -62,7 +62,7 @@
 with absolute file names.  Files generated from a source file\-\-like
 a C file generated from a source Cweb file\-\-will be recorded with
 the name of the source file.
-Compressed files are supported using gzip and bzip2.
+Compressed files are supported using gzip, bzip2, and xz.
 The programs recognize the language used in an input file based on its
 file name and contents.  The \fB\-\-language\fP switch can be used to force
 parsing of the file names following the switch according to the given
--- a/doc/misc/ChangeLog	Sat Sep 25 13:59:05 2010 -0700
+++ b/doc/misc/ChangeLog	Sat Sep 25 14:42:48 2010 -0700
@@ -1,3 +1,7 @@
+2010-09-25  Ulrich Mueller  <ulm@gentoo.org>
+
+	* woman.texi (Interface Options): xz compression is now supported.
+
 2010-09-24  Glenn Morris  <rgm@gnu.org>
 
 	* url.texi (Disk Caching): Tweak previous change.
--- a/doc/misc/woman.texi	Sat Sep 25 13:59:05 2010 -0700
+++ b/doc/misc/woman.texi	Sat Sep 25 14:42:48 2010 -0700
@@ -1121,8 +1121,8 @@
 for which decompressors are available and handled by auto-compression
 mode.  It should begin with @code{\\.} and end with @code{\\'} and
 @emph{must not} be optional.  The default value is
-@code{"\\.\\(g?z\\|bz2\\)\\'"}, which matches the @code{gzip} and
-@code{bzip2} compression extensions.
+@code{"\\.\\(g?z\\|bz2\\|xz\\)\\'"}, which matches the @code{gzip},
+@code{bzip2}, and @code{xz} compression extensions.
 
 @emph{Do not change this unless you are sure you know what you are doing!}
 
--- a/lib-src/ChangeLog	Sat Sep 25 13:59:05 2010 -0700
+++ b/lib-src/ChangeLog	Sat Sep 25 14:42:48 2010 -0700
@@ -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
--- a/lib-src/etags.c	Sat Sep 25 13:59:05 2010 -0700
+++ b/lib-src/etags.c	Sat Sep 25 14:42:48 2010 -0700
@@ -561,6 +561,7 @@
   { "gz", "gzip -d -c"},
   { "GZ", "gzip -d -c"},
   { "bz2", "bzip2 -d -c" },
+  { "xz", "xz -d -c" },
   { NULL }
 };
 
@@ -874,7 +875,7 @@
 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.");
--- a/lisp/ChangeLog	Sat Sep 25 13:59:05 2010 -0700
+++ b/lisp/ChangeLog	Sat Sep 25 14:42:48 2010 -0700
@@ -1,3 +1,14 @@
+2010-09-25  Ulrich Mueller  <ulm@gentoo.org>
+
+	* eshell/em-ls.el (eshell-ls-archive-regexp):
+	* eshell/esh-util.el (eshell-tar-regexp):
+	* ibuffer.el (ibuffer-compressed-file-name-regexp):
+	* info.el (Info-suffix-list):
+	* international/mule.el (auto-coding-alist):
+	* woman.el (woman-file-regexp, woman-file-compression-regexp):
+	* progmodes/etags.el (tags-compression-info-list):
+	Support xz compression.
+
 2010-09-25  Chong Yidong  <cyd@stupidchicken.com>
 
 	* files.el (get-free-disk-space): Don't assume the "df" output
--- a/lisp/eshell/em-ls.el	Sat Sep 25 13:59:05 2010 -0700
+++ b/lisp/eshell/em-ls.el	Sat Sep 25 14:42:48 2010 -0700
@@ -162,10 +162,11 @@
 
 (defcustom eshell-ls-archive-regexp
   (concat "\\.\\(t\\(a[rz]\\|gz\\)\\|arj\\|lzh\\|"
-	  "zip\\|[zZ]\\|gz\\|bz2\\|deb\\|rpm\\)\\'")
+	  "zip\\|[zZ]\\|gz\\|bz2\\|xz\\|deb\\|rpm\\)\\'")
   "*A regular expression that matches names of file archives.
 This typically includes both traditional archives and compressed
 files."
+  :version "24.1"			; added xz
   :type 'regexp
   :group 'eshell-ls)
 
--- a/lisp/eshell/esh-util.el	Sat Sep 25 13:59:05 2010 -0700
+++ b/lisp/eshell/esh-util.el	Sat Sep 25 14:42:48 2010 -0700
@@ -71,8 +71,9 @@
   :group 'eshell-util)
 
 (defcustom eshell-tar-regexp
-  "\\.t\\(ar\\(\\.\\(gz\\|bz2\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'"
+  "\\.t\\(ar\\(\\.\\(gz\\|bz2\\|xz\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'"
   "*Regular expression used to match tar file names."
+  :version "24.1"			; added xz
   :type 'regexp
   :group 'eshell-util)
 
--- a/lisp/ibuffer.el	Sat Sep 25 13:59:05 2010 -0700
+++ b/lisp/ibuffer.el	Sat Sep 25 14:42:48 2010 -0700
@@ -332,8 +332,9 @@
   :group 'ibuffer)
 
 (defcustom ibuffer-compressed-file-name-regexp
-  "\\.\\(arj\\|bgz\\|bz2\\|gz\\|lzh\\|taz\\|tgz\\|zip\\|z\\)$"
+  "\\.\\(arj\\|bgz\\|bz2\\|gz\\|lzh\\|taz\\|tgz\\|xz\\|zip\\|z\\)$"
   "Regexp to match compressed file names."
+  :version "24.1"                       ; added xz
   :type 'regexp
   :group 'ibuffer)
 
--- a/lisp/info.el	Sat Sep 25 13:59:05 2010 -0700
+++ b/lisp/info.el	Sat Sep 25 14:42:48 2010 -0700
@@ -402,24 +402,28 @@
        (".info.gz".   "gunzip")
        (".info.z".    "gunzip")
        (".info.bz2" . ("bzip2" "-dc"))
+       (".info.xz".   "unxz")
        (".info".      nil)
        ("-info.Z".   "uncompress")
        ("-info.Y".   "unyabba")
        ("-info.gz".  "gunzip")
        ("-info.bz2" . ("bzip2" "-dc"))
        ("-info.z".   "gunzip")
+       ("-info.xz".  "unxz")
        ("-info".     nil)
        ("/index.Z".   "uncompress")
        ("/index.Y".   "unyabba")
        ("/index.gz".  "gunzip")
        ("/index.z".   "gunzip")
        ("/index.bz2". ("bzip2" "-dc"))
+       ("/index.xz".  "unxz")
        ("/index".     nil)
        (".Z".         "uncompress")
        (".Y".         "unyabba")
        (".gz".        "gunzip")
        (".z".         "gunzip")
        (".bz2" .      ("bzip2" "-dc"))
+       (".xz".        "unxz")
        ("".           nil)))
   "List of file name suffixes and associated decoding commands.
 Each entry should be (SUFFIX . STRING); the file is given to
--- a/lisp/international/mule.el	Sat Sep 25 13:59:05 2010 -0700
+++ b/lisp/international/mule.el	Sat Sep 25 14:42:48 2010 -0700
@@ -1679,7 +1679,7 @@
      . no-conversion-multibyte)
     ("\\.\\(exe\\|EXE\\)\\'" . no-conversion)
     ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion)
-    ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion)
+    ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion)
     ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)
     ("\\.pdf\\'" . no-conversion)
     ("/#[^/]+#\\'" . emacs-mule)))
@@ -1690,6 +1690,7 @@
 The settings in this alist take priority over `coding:' tags
 in the file (see the function `set-auto-coding')
 and the contents of `file-coding-system-alist'."
+  :version "24.1"                       ; added xz
   :group 'files
   :group 'mule
   :type '(repeat (cons (regexp :tag "File name regexp")
--- a/lisp/progmodes/etags.el	Sat Sep 25 13:59:05 2010 -0700
+++ b/lisp/progmodes/etags.el	Sat Sep 25 14:42:48 2010 -0700
@@ -68,12 +68,14 @@
   :type '(repeat file))
 
 ;;;###autoload
-(defcustom tags-compression-info-list (purecopy '("" ".Z" ".bz2" ".gz" ".tgz"))
+(defcustom tags-compression-info-list
+  (purecopy '("" ".Z" ".bz2" ".gz" ".xz" ".tgz"))
   "*List of extensions tried by etags when jka-compr is used.
 An empty string means search the non-compressed file.
 These extensions will be tried only if jka-compr was activated
 \(i.e. via customize of `auto-compression-mode' or by calling the function
 `auto-compression-mode')."
+  :version "24.1"			; added xz
   :type  '(repeat string)
   :group 'etags)
 
--- a/lisp/woman.el	Sat Sep 25 13:59:05 2010 -0700
+++ b/lisp/woman.el	Sat Sep 25 14:42:48 2010 -0700
@@ -810,7 +810,7 @@
 
 (defvar woman-file-regexp nil
   "Regexp used to select (possibly compressed) man source files, e.g.
-\"\\.\\([0-9lmnt]\\w*\\)\\(\\.\\(g?z\\|bz2\\)\\)?\\'\".
+\"\\.\\([0-9lmnt]\\w*\\)\\(\\.\\(g?z\\|bz2\\|xz\\)\\)?\\'\".
 Built automatically from the customizable user options
 `woman-uncompressed-file-regexp' and `woman-file-compression-regexp'.")
 
@@ -846,16 +846,17 @@
   :group 'woman-interface)
 
 (defcustom woman-file-compression-regexp
-  "\\.\\(g?z\\|bz2\\)\\'"
+  "\\.\\(g?z\\|bz2\\|xz\\)\\'"
   "Do not change this unless you are sure you know what you are doing!
 Regexp used to match compressed man file extensions for which
 decompressors are available and handled by auto-compression mode,
-e.g. \"\\\\.\\\\(g?z\\\\|bz2\\\\)\\\\'\" for `gzip' or `bzip2'.
+e.g. \"\\\\.\\\\(g?z\\\\|bz2\\\\|xz\\\\)\\\\'\" for `gzip', `bzip2', or `xz'.
 Should begin with \\. and end with \\' and MUST NOT be optional."
   ;; Should be compatible with car of
   ;; `jka-compr-file-name-handler-entry', but that is unduly
   ;; complicated, includes an inappropriate extension (.tgz) and is
   ;; not loaded by default!
+  :version "24.1"                       ; added xz
   :type 'regexp
   :set 'set-woman-file-regexp
   :group 'woman-interface)