summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-sh.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b20f3e157c3..d748c1a967c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-19 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-sh.el (tramp-inline-compress-commands): Add "xz".
+ Suggested by Liam Stitt <stittl@cuug.ab.ca>.
+
2011-09-18 Juri Linkov <juri@jurta.org>
* buff-menu.el (Buffer-menu-mode-map):
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e50bb8498db..e94581392fa 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4025,6 +4025,7 @@ means discard it)."
(defconst tramp-inline-compress-commands
'(("gzip" "gzip -d")
("bzip2" "bzip2 -d")
+ ("xz" "xz -d")
("compress" "compress -d"))
"List of compress and decompress commands for inline transfer.
Each item is a list that looks like this: