[Emacs-diffs] Changes to emacs/lisp/dired-x.el,v

[Romain Francoise]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Romain Francoise <rfrancoise>   06/08/31 19:47:47

Index: dired-x.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dired-x.el,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- dired-x.el  21 May 2006 08:33:46 -0000      1.72
+++ dired-x.el  31 Aug 2006 19:47:46 -0000      1.73
@@ -967,7 +967,11 @@
                       "; " dired-guess-shell-gnutar " -C "
                       (file-name-sans-extension file) " -xvf")
             (concat "mkdir " (file-name-sans-extension file)
-                    "; tar -C " (file-name-sans-extension file) " -xvf")))
+                   "; tar -C " (file-name-sans-extension file) " -xvf"))
+        ;; List archive contents.
+        '(if dired-guess-shell-gnutar
+             (concat dired-guess-shell-gnutar " tvf")
+           "tar tvf"))
 
    ;; REGEXPS for compressed archives must come before the .Z rule to
    ;; be recognized:
@@ -994,7 +998,11 @@
                     "; gunzip -qc * | tar -C "
                     (file-name-sans-extension file) " -xvf -"))
          ;; Optional decompression.
-         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q" "")))
+        '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q" ""))
+        ;; List archive contents.
+        '(if dired-guess-shell-gnutar
+             (concat dired-guess-shell-gnutar " ztvf")
+           (concat "gunzip -qc * | tar tvf -")))
 
    ;; bzip2'ed archives
    (list "\\.t\\(ar\\.bz2\\|bz\\)$"
@@ -1049,7 +1057,8 @@
 
    '("\\.dvi$" "xdvi" "dvips")          ; preview and printing
    '("\\.au$" "play")                   ; play Sun audiofiles
-   '("\\.mpg$" "mpeg_play")
+   '("\\.mpe?g$\\|\\.avi$" "xine -p")
+   '("\\.wav$" "play")
    '("\\.uu$" "uudecode")               ; for uudecoded files
    '("\\.hqx$" "mcvert")
    '("\\.sh$" "sh")                     ; execute shell scripts
@@ -1064,10 +1073,14 @@
    '("\\.out$" "xgraph")                ; for plotting purposes.
    '("\\.tex$" "latex" "tex")
    '("\\.texi\\(nfo\\)?$" "makeinfo" "texi2dvi")
-   '("\\.pdf$" "xpdf")              ; edit PDF files
+   '("\\.pdf$" "xpdf")
+   '("\\.doc$" "antiword" "strings")
+   '("\\.rpm$" "rpm -qilp" "rpm -ivh")
+   '("\\.dia$" "dia")
+   '("\\.mgp$" "mgp")
 
    ;; Some other popular archivers.
-   (list "\\.zip$" "unzip"
+   (list "\\.zip$" "unzip" "unzip -l"
          ;; Extract files into a separate subdirectory
          '(concat "unzip" (if dired-guess-shell-gzip-quiet " -q")
                   " -d " (file-name-sans-extension file)))
@@ -1084,7 +1097,8 @@
          ;; Optional conversion to gzip format.
          '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
                   " " dired-guess-shell-znew-switches))
-   )
+
+   '("\\.sign?$" "gpg --verify"))
 
   "Default alist used for shell command guessing.
 See `dired-guess-shell-alist-user'.")