aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2004-03-23 07:39:35 +0000
committerJuri Linkov2004-03-23 07:39:35 +0000
commit999bd52a27e1c8d6e8088158dfae06574e115009 (patch)
tree4acc0310bf275ee6a2f9208f39c3f563569f9313
parentecd69427b6748edef5e288599793c602a5850655 (diff)
downloademacs-999bd52a27e1c8d6e8088158dfae06574e115009.tar.gz
emacs-999bd52a27e1c8d6e8088158dfae06574e115009.zip
(dired-compress-file-suffixes): Add dz and tbz.
(dired-compare-directories): Add default value for empty input.
-rw-r--r--lisp/dired-aux.el6
1 files changed, 5 insertions, 1 deletions
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'."
93Compare file attributes of files in the current directory 93Compare file attributes of files in the current directory
94with file attributes in directory DIR2 using PREDICATE on pairs of files 94with file attributes in directory DIR2 using PREDICATE on pairs of files
95with the same name. Mark files for which PREDICATE returns non-nil. 95with the same name. Mark files for which PREDICATE returns non-nil.
96Mark files with different names if PREDICATE is nil (or interactively
97when the user enters empty input at the predicate prompt).
96 98
97PREDICATE is a Lisp expression that can refer to the following variables: 99PREDICATE is a Lisp expression that can refer to the following variables:
98 100
@@ -115,7 +117,7 @@ Examples of PREDICATE:
115 (list (read-file-name (format "Compare %s with: " 117 (list (read-file-name (format "Compare %s with: "
116 (dired-current-directory)) 118 (dired-current-directory))
117 (dired-dwim-target-directory)) 119 (dired-dwim-target-directory))
118 (read-minibuffer "Mark if (lisp expr): "))) 120 (read-from-minibuffer "Mark if (lisp expr or RET): " nil nil t nil "nil")))
119 (let* ((dir1 (dired-current-directory)) 121 (let* ((dir1 (dired-current-directory))
120 (file-alist1 (dired-files-attributes dir1)) 122 (file-alist1 (dired-files-attributes dir1))
121 (file-alist2 (dired-files-attributes dir2)) 123 (file-alist2 (dired-files-attributes dir2))
@@ -659,6 +661,8 @@ and use this command with a prefix argument (the value does not matter)."
659 ;; For .z, try gunzip. It might be an old gzip file, 661 ;; For .z, try gunzip. It might be an old gzip file,
660 ;; or it might be from compact? pack? (which?) but gunzip handles both. 662 ;; or it might be from compact? pack? (which?) but gunzip handles both.
661 ("\\.z\\'" "" "gunzip") 663 ("\\.z\\'" "" "gunzip")
664 ("\\.dz\\'" "" "dictunzip")
665 ("\\.tbz\\'" ".tar" "bunzip2")
662 ("\\.bz2\\'" "" "bunzip2") 666 ("\\.bz2\\'" "" "bunzip2")
663 ;; This item controls naming for compression. 667 ;; This item controls naming for compression.
664 ("\\.tar\\'" ".tgz" nil)) 668 ("\\.tar\\'" ".tgz" nil))