Add .xz to some url code (tiny change).

* url-vars.el (url-uncompressor-alist):
* url-file.el (url-file-find-possibly-compressed-file, url-file):
Recognize .xz compression.

Fixes: debbugs:11839

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index f7fe5029afec8db48a791bb31c2f2b6e98fa2598..59222bcc957d3babe0dfb78a5ab62b29d77e615e 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-13  Liam Stitt  <stittl@cuug.ab.ca>  (tiny change)
+
+       * url-vars.el (url-uncompressor-alist):
+       * url-file.el (url-file-find-possibly-compressed-file, url-file):
+       Recognize .xz compression (Bug#11839).
+
 2012-10-13  Chong Yidong  <cyd@gnu.org>
 
        * url-http.el (url-http):

diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 4bbbdcf200cfab2a2a90d9ee42e8e855473826cf..3515d7493cc81a5c608d949c96a27447493a618c 100644 (file)
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -40,7 +40,7 @@ can do automatic decompression for them, and won't find 'foo' if
 'foo.gz' exists, even though the FTP server would happily serve it up
 to them."
   (let ((scratch nil)
-       (compressed-extensions '("" ".gz" ".z" ".Z" ".bz2"))
+       (compressed-extensions '("" ".gz" ".z" ".Z" ".bz2" ".xz"))
        (found nil))
     (while (and compressed-extensions (not found))
       (if (file-exists-p (setq scratch (concat fname (pop compressed-extensions))))
@@ -177,6 +177,7 @@ to them."
                             (".uue" "x-uuencoded")
                             (".hqx" "x-hqx")
                             (".bz2" "x-bzip2")
+                            (".xz" "x-xz")
                             (_ nil)))
 
     (if (file-directory-p filename)

diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 29f1e2cde0cd61b51ec3b138611343332b3c6efb..fdfd0e9868d2edbfaf582dcfa73f752aa6f5a255 100644 (file)
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -152,7 +152,8 @@ variable."
                                    (".uue" . "x-uuencoded")
                                    (".hqx" . "x-hqx")
                                    (".Z"  . "x-compress")
-                                   (".bz2"  . "x-bzip2"))
+                                   (".bz2" . "x-bzip2")
+                                   (".xz" . "x-xz"))
   "An alist of file extensions and appropriate content-transfer-encodings."
   :type '(repeat (cons :format "%v"
                       (string :tag "Extension")