summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-02-20 09:30:23 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2013-02-20 09:30:23 -0500
commit3bf1099fe6bd6a17af65d9088817ba31c6fa47f4 (patch)
treec3d3620bcdfa6799c8cfe18a3c56bfeb83521018
parentd8d2d18a7d85663f42d9d6f9859079e629428913 (diff)
* lisp/jka-cmpr-hook.el (jka-compr-compression-info-list)
(jka-compr-mode-alist-additions): Handle .txz suffix for XZ-compressed tar archives. Fixes: debbugs:13770
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/jka-cmpr-hook.el10
2 files changed, 16 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9568981b6..0a1e93ac19 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,13 @@
+2013-02-20 Ulrich Müller <ulm@gentoo.org>
+
+ * jka-cmpr-hook.el (jka-compr-compression-info-list)
+ (jka-compr-mode-alist-additions): Handle .txz suffix for
+ XZ-compressed tar archives (bug#13770).
+
2013-02-20 Bastien Guerry <bzg@gnu.org>
- * outline.el (outline-regexp, outline-heading-end-regexp): Make
- variables, not options (bug#13731).
+ * outline.el (outline-regexp, outline-heading-end-regexp):
+ Make variables, not options (bug#13731).
2013-02-20 Glenn Morris <rgm@gnu.org>
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index 7b36f7c121..851bceccf3 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -234,6 +234,10 @@ options through Custom does this automatically."
"XZ compressing" "xz" ("-c" "-q")
"XZ uncompressing" "xz" ("-c" "-q" "-d")
t t "\3757zXZ\0"]
+ ["\\.txz\\'"
+ "XZ compressing" "xz" ("-c" "-q")
+ "XZ uncompressing" "xz" ("-c" "-q" "-d")
+ t nil "\3757zXZ\0"]
;; dzip is gzip with random access. Its compression program can't
;; read/write stdin/out, so .dz files can only be viewed without
;; saving, having their contents decompressed with gzip.
@@ -302,7 +306,9 @@ variables. Setting this through Custom does that automatically."
:group 'jka-compr)
(defcustom jka-compr-mode-alist-additions
- (list (cons (purecopy "\\.tgz\\'") 'tar-mode) (cons (purecopy "\\.tbz2?\\'") 'tar-mode))
+ (purecopy '(("\\.tgz\\'" . tar-mode)
+ ("\\.tbz2?\\'" . tar-mode)
+ ("\\.txz\\'" . 'tar-mode)))
"List of pairs added to `auto-mode-alist' when installing jka-compr.
Uninstalling jka-compr removes all pairs from `auto-mode-alist' that
installing added.
@@ -315,7 +321,7 @@ variables. Setting this through Custom does that automatically."
:set 'jka-compr-set
:group 'jka-compr)
-(defcustom jka-compr-load-suffixes (list (purecopy ".gz"))
+(defcustom jka-compr-load-suffixes (purecopy '(".gz"))
"List of compression related suffixes to try when loading files.
Enabling Auto Compression mode appends this list to `load-file-rep-suffixes',
which see. Disabling Auto Compression mode removes all suffixes