From: Juri Linkov <juri@jurta.org>
Date: Tue, 23 Mar 2004 07:39:35 +0000 (+0000)
Subject: (dired-compress-file-suffixes): Add dz and tbz.
X-Git-Tag: ttn-vms-21-2-B4~7133
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=999bd52a27e1c8d6e8088158dfae06574e115009;p=emacs.git

(dired-compress-file-suffixes): Add dz and tbz.
(dired-compare-directories): Add default value for empty input.
---

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index fe8e33cfd48..1fc8e0e805a 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -93,6 +93,8 @@ With prefix arg, prompt for argument SWITCHES which is options for `diff'."
 Compare file attributes of files in the current directory
 with file attributes in directory DIR2 using PREDICATE on pairs of files
 with the same name.  Mark files for which PREDICATE returns non-nil.
+Mark files with different names if PREDICATE is nil (or interactively
+when the user enters empty input at the predicate prompt).
 
 PREDICATE is a Lisp expression that can refer to the following variables:
 
@@ -115,7 +117,7 @@ Examples of PREDICATE:
    (list (read-file-name (format "Compare %s with: "
 				 (dired-current-directory))
 			 (dired-dwim-target-directory))
-	 (read-minibuffer "Mark if (lisp expr): ")))
+         (read-from-minibuffer "Mark if (lisp expr or RET): " nil nil t nil "nil")))
   (let* ((dir1 (dired-current-directory))
          (file-alist1 (dired-files-attributes dir1))
          (file-alist2 (dired-files-attributes dir2))
@@ -659,6 +661,8 @@ and use this command with a prefix argument (the value does not matter)."
     ;; For .z, try gunzip.  It might be an old gzip file,
     ;; or it might be from compact? pack? (which?) but gunzip handles both.
     ("\\.z\\'" "" "gunzip")
+    ("\\.dz\\'" "" "dictunzip")
+    ("\\.tbz\\'" ".tar" "bunzip2")
     ("\\.bz2\\'" "" "bunzip2")
     ;; This item controls naming for compression.
     ("\\.tar\\'" ".tgz" nil))