aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-11-23 00:32:37 +0000
committerGlenn Morris2009-11-23 00:32:37 +0000
commitc10e06335efc44a628996547291c7b82b7ffe17a (patch)
treec45e6a1f22e415eb0fb664d7a76051b0ab09eccd
parent2054a44ca6e03c49ded89c7b7a7612490e767473 (diff)
downloademacs-c10e06335efc44a628996547291c7b82b7ffe17a.tar.gz
emacs-c10e06335efc44a628996547291c7b82b7ffe17a.zip
Sven Joachim <svenjoac at gmx.de>
(dired-guess-shell-alist-default): Support xz format. (Bug#4953)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired-x.el11
2 files changed, 16 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b39254f2d3..797e258b339 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-11-23 Sven Joachim <svenjoac@gmx.de>
2
3 * dired-x.el (dired-guess-shell-alist-default):
4 Support xz format. (Bug#4953)
5
12009-11-22 Chong Yidong <cyd@stupidchicken.com> 62009-11-22 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * cedet/srecode/map.el (srecode-get-maps): 8 * cedet/srecode/map.el (srecode-get-maps):
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 4da19f66c90..dce8685795a 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1017,6 +1017,16 @@ dired."
1017 ;; Optional decompression. 1017 ;; Optional decompression.
1018 "bunzip2") 1018 "bunzip2")
1019 1019
1020 ;; xz'ed archives
1021 (list "\\.t\\(ar\\.\\)?xz$"
1022 "unxz -c * | tar xvf -"
1023 ;; Extract files into a separate subdirectory
1024 '(concat "mkdir " (file-name-sans-extension file)
1025 "; unxz -c * | tar -C "
1026 (file-name-sans-extension file) " -xvf -")
1027 ;; Optional decompression.
1028 "unxz")
1029
1020 '("\\.shar\\.Z$" "zcat * | unshar") 1030 '("\\.shar\\.Z$" "zcat * | unshar")
1021 '("\\.shar\\.g?z$" "gunzip -qc * | unshar") 1031 '("\\.shar\\.g?z$" "gunzip -qc * | unshar")
1022 1032
@@ -1098,6 +1108,7 @@ dired."
1098 (list "\\.g?z$" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q"))) 1108 (list "\\.g?z$" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
1099 (list "\\.dz$" "dictunzip") 1109 (list "\\.dz$" "dictunzip")
1100 (list "\\.bz2$" "bunzip2") 1110 (list "\\.bz2$" "bunzip2")
1111 (list "\\.xz$" "unxz")
1101 (list "\\.Z$" "uncompress" 1112 (list "\\.Z$" "uncompress"
1102 ;; Optional conversion to gzip format. 1113 ;; Optional conversion to gzip format.
1103 '(concat "znew" (if dired-guess-shell-gzip-quiet " -q") 1114 '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")