mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-06 11:55:48 +00:00
Code Issues Releases Activity

* lisp/dired-x.el (dired-guess-shell-alist-default): Use \\', not $.

Browse Source
This commit is contained in:
Glenn Morris 2011-02-28 09:42:03 -08:00
parent 5d41af1934
commit 0a906ec344
2 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2011-02-28 Glenn Morris <rgm@gnu.org>
* dired-x.el (dired-guess-shell-alist-default): Use \\', not $.
2011-02-28 Michael Albinus <michael.albinus@gmx.de> 2011-02-28 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-cmds.el (tramp-append-tramp-buffers): Dump load-path * net/tramp-cmds.el (tramp-append-tramp-buffers): Dump load-path

110
lisp/dired-x.el
View File

@ -845,7 +845,7 @@ replace it with a dir-locals-file `./%s'"
(defvar dired-guess-shell-alist-default (defvar dired-guess-shell-alist-default
(list (list
(list "\\.tar$" (list "\\.tar\\'"
'(if dired-guess-shell-gnutar '(if dired-guess-shell-gnutar
(concat dired-guess-shell-gnutar " xvf") (concat dired-guess-shell-gnutar " xvf")
"tar xvf") "tar xvf")
@ -863,7 +863,7 @@ replace it with a dir-locals-file `./%s'"
;; REGEXPS for compressed archives must come before the .Z rule to ;; REGEXPS for compressed archives must come before the .Z rule to
;; be recognized: ;; be recognized:
(list "\\.tar\\.Z$" (list "\\.tar\\.Z\\'"
;; Untar it. ;; Untar it.
'(if dired-guess-shell-gnutar '(if dired-guess-shell-gnutar
(concat dired-guess-shell-gnutar " zxvf") (concat dired-guess-shell-gnutar " zxvf")
@ -873,7 +873,7 @@ replace it with a dir-locals-file `./%s'"
" " dired-guess-shell-znew-switches)) " " dired-guess-shell-znew-switches))
;; gzip'ed archives ;; gzip'ed archives
(list "\\.t\\(ar\\.\\)?gz$" (list "\\.t\\(ar\\.\\)?gz\\'"
'(if dired-guess-shell-gnutar '(if dired-guess-shell-gnutar
(concat dired-guess-shell-gnutar " zxvf") (concat dired-guess-shell-gnutar " zxvf")
(concat "gunzip -qc * | tar xvf -")) (concat "gunzip -qc * | tar xvf -"))
@ -893,7 +893,7 @@ replace it with a dir-locals-file `./%s'"
(concat "gunzip -qc * | tar tvf -"))) (concat "gunzip -qc * | tar tvf -")))
;; bzip2'ed archives ;; bzip2'ed archives
(list "\\.t\\(ar\\.bz2\\|bz\\)$" (list "\\.t\\(ar\\.bz2\\|bz\\)\\'"
"bunzip2 -c * | tar xvf -" "bunzip2 -c * | tar xvf -"
;; Extract files into a separate subdirectory ;; Extract files into a separate subdirectory
'(concat "mkdir " (file-name-sans-extension file) '(concat "mkdir " (file-name-sans-extension file)
@ -903,7 +903,7 @@ replace it with a dir-locals-file `./%s'"
"bunzip2") "bunzip2")
;; xz'ed archives ;; xz'ed archives
(list "\\.t\\(ar\\.\\)?xz$" (list "\\.t\\(ar\\.\\)?xz\\'"
"unxz -c * | tar xvf -" "unxz -c * | tar xvf -"
;; Extract files into a separate subdirectory ;; Extract files into a separate subdirectory
'(concat "mkdir " (file-name-sans-extension file) '(concat "mkdir " (file-name-sans-extension file)
@ -912,96 +912,96 @@ replace it with a dir-locals-file `./%s'"
;; Optional decompression. ;; Optional decompression.
"unxz") "unxz")
'("\\.shar\\.Z$" "zcat * | unshar") '("\\.shar\\.Z\\'" "zcat * | unshar")
'("\\.shar\\.g?z$" "gunzip -qc * | unshar") '("\\.shar\\.g?z\\'" "gunzip -qc * | unshar")
'("\\.e?ps$" "ghostview" "xloadimage" "lpr") '("\\.e?ps\\'" "ghostview" "xloadimage" "lpr")
(list "\\.e?ps\\.g?z$" "gunzip -qc * | ghostview -" (list "\\.e?ps\\.g?z\\'" "gunzip -qc * | ghostview -"
;; Optional decompression. ;; Optional decompression.
'(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q"))) '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
(list "\\.e?ps\\.Z$" "zcat * | ghostview -" (list "\\.e?ps\\.Z\\'" "zcat * | ghostview -"
;; Optional conversion to gzip format. ;; Optional conversion to gzip format.
'(concat "znew" (if dired-guess-shell-gzip-quiet " -q") '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
" " dired-guess-shell-znew-switches)) " " dired-guess-shell-znew-switches))
'("\\.patch$" "cat * | patch") '("\\.patch\\'" "cat * | patch")
(list "\\.patch\\.g?z$" "gunzip -qc * | patch" (list "\\.patch\\.g?z\\'" "gunzip -qc * | patch"
;; Optional decompression. ;; Optional decompression.
'(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q"))) '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
(list "\\.patch\\.Z$" "zcat * | patch" (list "\\.patch\\.Z\\'" "zcat * | patch"
;; Optional conversion to gzip format. ;; Optional conversion to gzip format.
'(concat "znew" (if dired-guess-shell-gzip-quiet " -q") '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
" " dired-guess-shell-znew-switches)) " " dired-guess-shell-znew-switches))
;; The following four extensions are useful with dired-man ("N" key) ;; The following four extensions are useful with dired-man ("N" key)
(list "\\.\\(?:[0-9]\\|man\\)$" '(progn (require 'man) (list "\\.\\(?:[0-9]\\|man\\)\\'" '(progn (require 'man)
(if (Man-support-local-filenames) (if (Man-support-local-filenames)
"man -l" "man -l"
"cat * | tbl | nroff -man -h"))) "cat * | tbl | nroff -man -h")))
(list "\\.\\(?:[0-9]\\|man\\)\\.g?z$" '(progn (require 'man) (list "\\.\\(?:[0-9]\\|man\\)\\.g?z\\'" '(progn (require 'man)
(if (Man-support-local-filenames) (if (Man-support-local-filenames)
"man -l" "man -l"
"gunzip -qc * | tbl | nroff -man -h")) "gunzip -qc * | tbl | nroff -man -h"))
;; Optional decompression. ;; Optional decompression.
'(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q"))) '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
(list "\\.[0-9]\\.Z$" '(progn (require 'man) (list "\\.[0-9]\\.Z\\'" '(progn (require 'man)
(if (Man-support-local-filenames) (if (Man-support-local-filenames)
"man -l" "man -l"
"zcat * | tbl | nroff -man -h")) "zcat * | tbl | nroff -man -h"))
;; Optional conversion to gzip format. ;; Optional conversion to gzip format.
'(concat "znew" (if dired-guess-shell-gzip-quiet " -q") '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
" " dired-guess-shell-znew-switches)) " " dired-guess-shell-znew-switches))
'("\\.pod$" "perldoc" "pod2man * | nroff -man") '("\\.pod\\'" "perldoc" "pod2man * | nroff -man")
'("\\.dvi$" "xdvi" "dvips") ; preview and printing '("\\.dvi\\'" "xdvi" "dvips") ; preview and printing
'("\\.au$" "play") ; play Sun audiofiles '("\\.au\\'" "play") ; play Sun audiofiles
'("\\.mpe?g$\\|\\.avi$" "xine -p") '("\\.mpe?g\\'\\|\\.avi\\'" "xine -p")
'("\\.ogg$" "ogg123") '("\\.ogg\\'" "ogg123")
'("\\.mp3$" "mpg123") '("\\.mp3\\'" "mpg123")
'("\\.wav$" "play") '("\\.wav\\'" "play")
'("\\.uu$" "uudecode") ; for uudecoded files '("\\.uu\\'" "uudecode") ; for uudecoded files
'("\\.hqx$" "mcvert") '("\\.hqx\\'" "mcvert")
'("\\.sh$" "sh") ; execute shell scripts '("\\.sh\\'" "sh") ; execute shell scripts
'("\\.xbm$" "bitmap") ; view X11 bitmaps '("\\.xbm\\'" "bitmap") ; view X11 bitmaps
'("\\.gp$" "gnuplot") '("\\.gp\\'" "gnuplot")
'("\\.p[bgpn]m$" "xloadimage") '("\\.p[bgpn]m\\'" "xloadimage")
'("\\.gif$" "xloadimage") ; view gif pictures '("\\.gif\\'" "xloadimage") ; view gif pictures
'("\\.tif$" "xloadimage") '("\\.tif\\'" "xloadimage")
'("\\.png$" "display") ; xloadimage 4.1 doesn't grok PNG '("\\.png\\'" "display") ; xloadimage 4.1 doesn't grok PNG
'("\\.jpe?g$" "xloadimage") '("\\.jpe?g\\'" "xloadimage")
'("\\.fig$" "xfig") ; edit fig pictures '("\\.fig\\'" "xfig") ; edit fig pictures
'("\\.out$" "xgraph") ; for plotting purposes. '("\\.out\\'" "xgraph") ; for plotting purposes.
'("\\.tex$" "latex" "tex") '("\\.tex\\'" "latex" "tex")
'("\\.texi\\(nfo\\)?$" "makeinfo" "texi2dvi") '("\\.texi\\(nfo\\)?\\'" "makeinfo" "texi2dvi")
'("\\.pdf$" "xpdf") '("\\.pdf\\'" "xpdf")
'("\\.doc$" "antiword" "strings") '("\\.doc\\'" "antiword" "strings")
'("\\.rpm$" "rpm -qilp" "rpm -ivh") '("\\.rpm\\'" "rpm -qilp" "rpm -ivh")
'("\\.dia$" "dia") '("\\.dia\\'" "dia")
'("\\.mgp$" "mgp") '("\\.mgp\\'" "mgp")
;; Some other popular archivers. ;; Some other popular archivers.
(list "\\.zip$" "unzip" "unzip -l" (list "\\.zip\\'" "unzip" "unzip -l"
;; Extract files into a separate subdirectory ;; Extract files into a separate subdirectory
'(concat "unzip" (if dired-guess-shell-gzip-quiet " -q") '(concat "unzip" (if dired-guess-shell-gzip-quiet " -q")
" -d " (file-name-sans-extension file))) " -d " (file-name-sans-extension file)))
'("\\.zoo$" "zoo x//") '("\\.zoo\\'" "zoo x//")
'("\\.lzh$" "lharc x") '("\\.lzh\\'" "lharc x")
'("\\.arc$" "arc x") '("\\.arc\\'" "arc x")
'("\\.shar$" "unshar") '("\\.shar\\'" "unshar")
'("\\.rar$" "unrar x") '("\\.rar\\'" "unrar x")
'("\\.7z$" "7z x") '("\\.7z\\'" "7z x")
;; Compression. ;; Compression.
(list "\\.g?z$" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q"))) (list "\\.g?z\\'" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
(list "\\.dz$" "dictunzip") (list "\\.dz\\'" "dictunzip")
(list "\\.bz2$" "bunzip2") (list "\\.bz2\\'" "bunzip2")
(list "\\.xz$" "unxz") (list "\\.xz\\'" "unxz")
(list "\\.Z$" "uncompress" (list "\\.Z\\'" "uncompress"
;; Optional conversion to gzip format. ;; Optional conversion to gzip format.
'(concat "znew" (if dired-guess-shell-gzip-quiet " -q") '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
" " dired-guess-shell-znew-switches)) " " dired-guess-shell-znew-switches))
'("\\.sign?$" "gpg --verify")) '("\\.sign?\\'" "gpg --verify"))
"Default alist used for shell command guessing. "Default alist used for shell command guessing.
See `dired-guess-shell-alist-user'.") See `dired-guess-shell-alist-user'.")