[Emacs-diffs] /srv/bzr/emacs/trunk r110534: Add .xz to some url code (tiny change).

[Chong Yidong]

------------------------------------------------------------
revno: 110534
fixes bug: http://debbugs.gnu.org/11839
author: Liam Stitt <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-13 18:51:26 +0800
message:
  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.
modified:
  lisp/url/ChangeLog
  lisp/url/url-file.el
  lisp/url/url-vars.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-10-13 09:37:25 +0000
+++ b/lisp/url/ChangeLog        2012-10-13 10:51:26 +0000
@@ -1,3 +1,9 @@
+2012-10-13  Liam Stitt  <address@hidden>  (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  <address@hidden>
 
        * url-http.el (url-http):

=== modified file 'lisp/url/url-file.el'
--- a/lisp/url/url-file.el      2012-07-11 23:13:41 +0000
+++ b/lisp/url/url-file.el      2012-10-13 10:51:26 +0000
@@ -40,7 +40,7 @@
 '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 @@
                             (".uue" "x-uuencoded")
                             (".hqx" "x-hqx")
                             (".bz2" "x-bzip2")
+                            (".xz" "x-xz")
                             (_ nil)))
 
     (if (file-directory-p filename)

=== modified file 'lisp/url/url-vars.el'
--- a/lisp/url/url-vars.el      2012-06-30 21:13:05 +0000
+++ b/lisp/url/url-vars.el      2012-10-13 10:51:26 +0000
@@ -152,7 +152,8 @@
                                    (".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")