From 0a906ec3442e226aab69ca52edd44b4cdb1386e4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 28 Feb 2011 09:42:03 -0800 Subject: [PATCH] * lisp/dired-x.el (dired-guess-shell-alist-default): Use \\', not $. --- lisp/ChangeLog | 4 ++ lisp/dired-x.el | 112 ++++++++++++++++++++++++------------------------ 2 files changed, 60 insertions(+), 56 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83b29a7e55c..d38672c0d6b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-02-28 Glenn Morris + + * dired-x.el (dired-guess-shell-alist-default): Use \\', not $. + 2011-02-28 Michael Albinus * net/tramp-cmds.el (tramp-append-tramp-buffers): Dump load-path diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 6ed3cd11312..816beb0034c 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -845,7 +845,7 @@ replace it with a dir-locals-file `./%s'" (defvar dired-guess-shell-alist-default (list - (list "\\.tar$" + (list "\\.tar\\'" '(if dired-guess-shell-gnutar (concat dired-guess-shell-gnutar " 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 ;; be recognized: - (list "\\.tar\\.Z$" + (list "\\.tar\\.Z\\'" ;; Untar it. '(if dired-guess-shell-gnutar (concat dired-guess-shell-gnutar " zxvf") @@ -873,7 +873,7 @@ replace it with a dir-locals-file `./%s'" " " dired-guess-shell-znew-switches)) ;; gzip'ed archives - (list "\\.t\\(ar\\.\\)?gz$" + (list "\\.t\\(ar\\.\\)?gz\\'" '(if dired-guess-shell-gnutar (concat dired-guess-shell-gnutar " zxvf") (concat "gunzip -qc * | tar xvf -")) @@ -893,7 +893,7 @@ replace it with a dir-locals-file `./%s'" (concat "gunzip -qc * | tar tvf -"))) ;; bzip2'ed archives - (list "\\.t\\(ar\\.bz2\\|bz\\)$" + (list "\\.t\\(ar\\.bz2\\|bz\\)\\'" "bunzip2 -c * | tar xvf -" ;; Extract files into a separate subdirectory '(concat "mkdir " (file-name-sans-extension file) @@ -903,7 +903,7 @@ replace it with a dir-locals-file `./%s'" "bunzip2") ;; xz'ed archives - (list "\\.t\\(ar\\.\\)?xz$" + (list "\\.t\\(ar\\.\\)?xz\\'" "unxz -c * | tar xvf -" ;; Extract files into a separate subdirectory '(concat "mkdir " (file-name-sans-extension file) @@ -912,96 +912,96 @@ replace it with a dir-locals-file `./%s'" ;; Optional decompression. "unxz") - '("\\.shar\\.Z$" "zcat * | unshar") - '("\\.shar\\.g?z$" "gunzip -qc * | unshar") + '("\\.shar\\.Z\\'" "zcat * | unshar") + '("\\.shar\\.g?z\\'" "gunzip -qc * | unshar") - '("\\.e?ps$" "ghostview" "xloadimage" "lpr") - (list "\\.e?ps\\.g?z$" "gunzip -qc * | ghostview -" + '("\\.e?ps\\'" "ghostview" "xloadimage" "lpr") + (list "\\.e?ps\\.g?z\\'" "gunzip -qc * | ghostview -" ;; Optional decompression. '(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. '(concat "znew" (if dired-guess-shell-gzip-quiet " -q") " " dired-guess-shell-znew-switches)) - '("\\.patch$" "cat * | patch") - (list "\\.patch\\.g?z$" "gunzip -qc * | patch" + '("\\.patch\\'" "cat * | patch") + (list "\\.patch\\.g?z\\'" "gunzip -qc * | patch" ;; Optional decompression. '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q"))) - (list "\\.patch\\.Z$" "zcat * | patch" + (list "\\.patch\\.Z\\'" "zcat * | patch" ;; Optional conversion to gzip format. '(concat "znew" (if dired-guess-shell-gzip-quiet " -q") " " dired-guess-shell-znew-switches)) ;; 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) "man -l" "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) "man -l" "gunzip -qc * | tbl | nroff -man -h")) ;; Optional decompression. '(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) "man -l" "zcat * | tbl | nroff -man -h")) ;; Optional conversion to gzip format. '(concat "znew" (if dired-guess-shell-gzip-quiet " -q") " " dired-guess-shell-znew-switches)) - '("\\.pod$" "perldoc" "pod2man * | nroff -man") - - '("\\.dvi$" "xdvi" "dvips") ; preview and printing - '("\\.au$" "play") ; play Sun audiofiles - '("\\.mpe?g$\\|\\.avi$" "xine -p") - '("\\.ogg$" "ogg123") - '("\\.mp3$" "mpg123") - '("\\.wav$" "play") - '("\\.uu$" "uudecode") ; for uudecoded files - '("\\.hqx$" "mcvert") - '("\\.sh$" "sh") ; execute shell scripts - '("\\.xbm$" "bitmap") ; view X11 bitmaps - '("\\.gp$" "gnuplot") - '("\\.p[bgpn]m$" "xloadimage") - '("\\.gif$" "xloadimage") ; view gif pictures - '("\\.tif$" "xloadimage") - '("\\.png$" "display") ; xloadimage 4.1 doesn't grok PNG - '("\\.jpe?g$" "xloadimage") - '("\\.fig$" "xfig") ; edit fig pictures - '("\\.out$" "xgraph") ; for plotting purposes. - '("\\.tex$" "latex" "tex") - '("\\.texi\\(nfo\\)?$" "makeinfo" "texi2dvi") - '("\\.pdf$" "xpdf") - '("\\.doc$" "antiword" "strings") - '("\\.rpm$" "rpm -qilp" "rpm -ivh") - '("\\.dia$" "dia") - '("\\.mgp$" "mgp") + '("\\.pod\\'" "perldoc" "pod2man * | nroff -man") + + '("\\.dvi\\'" "xdvi" "dvips") ; preview and printing + '("\\.au\\'" "play") ; play Sun audiofiles + '("\\.mpe?g\\'\\|\\.avi\\'" "xine -p") + '("\\.ogg\\'" "ogg123") + '("\\.mp3\\'" "mpg123") + '("\\.wav\\'" "play") + '("\\.uu\\'" "uudecode") ; for uudecoded files + '("\\.hqx\\'" "mcvert") + '("\\.sh\\'" "sh") ; execute shell scripts + '("\\.xbm\\'" "bitmap") ; view X11 bitmaps + '("\\.gp\\'" "gnuplot") + '("\\.p[bgpn]m\\'" "xloadimage") + '("\\.gif\\'" "xloadimage") ; view gif pictures + '("\\.tif\\'" "xloadimage") + '("\\.png\\'" "display") ; xloadimage 4.1 doesn't grok PNG + '("\\.jpe?g\\'" "xloadimage") + '("\\.fig\\'" "xfig") ; edit fig pictures + '("\\.out\\'" "xgraph") ; for plotting purposes. + '("\\.tex\\'" "latex" "tex") + '("\\.texi\\(nfo\\)?\\'" "makeinfo" "texi2dvi") + '("\\.pdf\\'" "xpdf") + '("\\.doc\\'" "antiword" "strings") + '("\\.rpm\\'" "rpm -qilp" "rpm -ivh") + '("\\.dia\\'" "dia") + '("\\.mgp\\'" "mgp") ;; Some other popular archivers. - (list "\\.zip$" "unzip" "unzip -l" + (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))) - '("\\.zoo$" "zoo x//") - '("\\.lzh$" "lharc x") - '("\\.arc$" "arc x") - '("\\.shar$" "unshar") - '("\\.rar$" "unrar x") - '("\\.7z$" "7z x") + '("\\.zoo\\'" "zoo x//") + '("\\.lzh\\'" "lharc x") + '("\\.arc\\'" "arc x") + '("\\.shar\\'" "unshar") + '("\\.rar\\'" "unrar x") + '("\\.7z\\'" "7z x") ;; Compression. - (list "\\.g?z$" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q"))) - (list "\\.dz$" "dictunzip") - (list "\\.bz2$" "bunzip2") - (list "\\.xz$" "unxz") - (list "\\.Z$" "uncompress" + (list "\\.g?z\\'" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q"))) + (list "\\.dz\\'" "dictunzip") + (list "\\.bz2\\'" "bunzip2") + (list "\\.xz\\'" "unxz") + (list "\\.Z\\'" "uncompress" ;; Optional conversion to gzip format. '(concat "znew" (if dired-guess-shell-gzip-quiet " -q") " " dired-guess-shell-znew-switches)) - '("\\.sign?$" "gpg --verify")) + '("\\.sign?\\'" "gpg --verify")) "Default alist used for shell command guessing. See `dired-guess-shell-alist-user'.") -- 2.39.5