=Minor improvements in management of XZ archives.

The latest version of AVFS manages xz properly now.
escherdragon · Dec 29, 2011 · e30a75a · e30a75a
1 parent d70c99c
commit e30a75a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/sunrise-commander.el b/sunrise-commander.el
@@ -7,7 +7,7 @@
 ;; Maintainer: José Alfredo Romero L. <escherdragon@gmail.com>
 ;; Created: 24 Sep 2007
 ;; Version: 5
-;; RCS Version: $Rev: 395 $
+;; RCS Version: $Rev: 396 $
 ;; Keywords: files, dired, midnight commander, norton, orthodox
 ;; URL: http://www.emacswiki.org/emacs/sunrise-commander.el
 ;; Compatibility: GNU Emacs 22+
@@ -272,13 +272,14 @@ Setting this value activates AVFS support."
           (const :tag "AVFS support disabled" nil)
           (directory :tag "AVFS root directory")))
 
-(defcustom sr-avfs-handlers-alist '(("\\.[jwesh]ar$"   . "#uzip/")
-                                    ("\\.xpi$"         . "#uzip/")
-                                    ("\\.apk$"         . "#uzip/")
-                                    ("\\.iso$"         . "#iso9660/")
-                                    ("\\.patch$"       . "#/")
-                                    ("\\.tar.xz$"      . "#uxze#utar/")
-                                    ("."               . "#/"))
+(defcustom sr-avfs-handlers-alist '(("\\.[jwesh]ar$" . "#uzip/")
+                                    ("\\.wsar$"      . "#uzip/")
+                                    ("\\.xpi$"       . "#uzip/")
+                                    ("\\.apk$"       . "#uzip/")
+                                    ("\\.iso$"       . "#iso9660/")
+                                    ("\\.patch$"     . "#/")
+                                    ("\\.txz$"       . "#/")
+                                    ("."             . "#/"))
   "List of AVFS handlers to manage specific file extensions."
   :group 'sunrise
   :type 'alist)
@@ -4052,7 +4053,7 @@ with advice matching REGEXP."
 (sr-rainbow sr-html-face              (:foreground "DarkOliveGreen")        "\\(^..[^d].*\\.x?html?$\\)")
 (sr-rainbow sr-xml-face               (:foreground "DarkGreen")             "\\(^..[^d].*\\.\\(xml\\|xsd\\|xslt?\\|wsdl\\)$\\)")
 (sr-rainbow sr-log-face               (:foreground "brown")                 "\\(^..[^d].*\\.log$\\)")
-(sr-rainbow sr-compressed-face        (:foreground "magenta")               "\\(^..[^d].*\\.\\(zip\\|bz2\\|t?gz\\|[zZ]\\|[jwers]?ar\\|xpi\\|apk\\|xz\\)$\\)")
+(sr-rainbow sr-compressed-face        (:foreground "magenta")               "\\(^..[^d].*\\.\\(zip\\|bz2\\|t?[gx]z\\|[zZ]\\|[jwers]?ar\\|xpi\\|apk\\|xz\\)$\\)")
 (sr-rainbow sr-packaged-face          (:foreground "DarkMagenta")           "\\(^..[^d].*\\.\\(deb\\|rpm\\)$\\)")
 (sr-rainbow sr-encrypted-face         (:foreground "DarkOrange1")           "\\(^..[^d].*\\.\\(gpg\\|pgp\\)$\\)")
 

diff --git a/sunrise-x-mirror.el b/sunrise-x-mirror.el
@@ -7,7 +7,7 @@
 ;; Maintainer: José Alfredo Romero L. <escherdragon@gmail.com>
 ;; Created: 4 May 2008
 ;; Version: 2
-;; RCS Version: $Rev: 395 $
+;; RCS Version: $Rev: 396 $
 ;; Keywords: sunrise commander, archives read/write
 ;; URL: http://www.emacswiki.org/emacs/sunrise-x-mirror.el
 ;; Compatibility: GNU Emacs 22+
@@ -132,7 +132,7 @@
     ("\\.tar$"                     . "tar cvf  %f *")
     ("\\.\\(?:tar\\.gz\\|tgz\\)$"  . "tar cvzf %f *")
     ("\\.tar\\.bz2$"               . "tar cvjf %f *")
-    ("\\.tar\\.xz$"                . "tar cvJf %f *")
+    ("\\.\\(?:tar\\.xz\\|txz\\)$"  . "tar cvJf %f *")
    )
   "List of shell commands to repack particular archive contents.
 Used when repacking contents from a mirror area into a compressed