*** empty log message ***

[gnu-emacs] / lisp / dired-x.el

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index b9c2d13b2ae9f58bd2b22892961b15ed08069aed..808dc3b5dc87ae285fdd43fd7ee5ddd8161181c4 100644 (file)
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -208,7 +208,7 @@ toggle between those two."
   :type 'boolean
   :group 'dired-x)
 
-(defcustom dired-omit-size-limit 20000
+(defcustom dired-omit-size-limit 30000
   "*Maximum size for the \"omitting\" feature.
 If nil, there is no maximum size."
   :type '(choice (const :tag "no maximum" nil) integer)
@@ -580,7 +580,12 @@ This functions works by temporarily binding `dired-marker-char' to
   (if (and dired-omit-files-p
            (or (interactive-p)
                (not dired-omit-size-limit)
-               (< (buffer-size) dired-omit-size-limit)))
+               (< (buffer-size) dired-omit-size-limit)
+              (progn
+                (message "Not omitting: directory larger than %d characters."
+                         dired-omit-size-limit)
+                (setq dired-omit-files-p nil)
+                nil)))
       (let ((omit-re (or regexp (dired-omit-regexp)))
             (old-modified-p (buffer-modified-p))
             count)
@@ -818,7 +823,9 @@ cases in variable `default-directory-alist' (which see)."
 
 (defun dired-smart-shell-command (cmd &optional insert)
   "Like function `shell-command', but in the current Tree Dired directory."
-  (interactive "sShell command: \nP")
+  (interactive (list (read-from-minibuffer "Shell command: "
+                                          nil nil nil 'shell-command-history)
+                    current-prefix-arg))
   (let ((default-directory (default-directory)))
     (shell-command cmd insert)))
 
@@ -946,12 +953,17 @@ dired."
                   " " dired-guess-shell-znew-switches))
 
    ;; gzip'ed archives
-   (list "\\.t\\(ar\\.\\)g?z$"
+   (list "\\.t\\(ar\\.\\)?gz$"
          '(if dired-guess-shell-gnutar
               (concat dired-guess-shell-gnutar " zxvf")
             (concat "gunzip -qc * | tar xvf -"))
          ;; Optional decompression.
          '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q" "")))
+   ;; bzip2'ed archives
+   (list "\\.tar\\.bz2$"
+        "bunzip2 -c * | tar xvf -"
+        ;; Optional decompression.
+         "bunzip2")
 
    '("\\.shar.Z$" "zcat * | unshar")
    '("\\.shar.g?z$" "gunzip -qc * | unshar")
@@ -998,6 +1010,7 @@ dired."
 
    ;; Compression.
    (list "\\.g?z$" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
+   (list "\\.bz2$" "bunzip2")
    (list "\\.Z$" "uncompress"
          ;; Optional conversion to gzip format.
          '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")