[Emacs-diffs] /srv/bzr/emacs/trunk r111835: * lisp/jka-cmpr-hook.el (jka-compr-compression-info-list)

[Stefan Monnier]

------------------------------------------------------------
revno: 111835
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13770
author: Ulrich Müller <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-02-20 09:30:23 -0500
message:
  * lisp/jka-cmpr-hook.el (jka-compr-compression-info-list)
  (jka-compr-mode-alist-additions): Handle .txz suffix for
  XZ-compressed tar archives.
modified:
  lisp/ChangeLog
  lisp/jka-cmpr-hook.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-20 13:05:24 +0000
+++ b/lisp/ChangeLog    2013-02-20 14:30:23 +0000
@@ -1,7 +1,13 @@
+2013-02-20  Ulrich Müller  <address@hidden>
+
+       * 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  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/jka-cmpr-hook.el'
--- a/lisp/jka-cmpr-hook.el     2013-01-01 09:11:05 +0000
+++ b/lisp/jka-cmpr-hook.el     2013-02-20 14:30:23 +0000
@@ -234,6 +234,10 @@
      "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 @@
   :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 @@
   :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