summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/dired.texi12
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/dired-aux.el2
-rw-r--r--lisp/dired.el2
4 files changed, 15 insertions, 3 deletions
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index b00c974ef2c..e7e49445b54 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -722,7 +722,17 @@ suitable guess made using the variables @code{lpr-command} and
@cindex compressing files (in Dired)
@item Z
Compress the specified files (@code{dired-do-compress}). If the file
-appears to be a compressed file already, uncompress it instead.
+appears to be a compressed file already, uncompress it instead. Each
+marked file is compressed into its own archive.
+
+@findex dired-do-compress-to
+@kindex c @r{(Dired)}
+@cindex compressing files (in Dired)
+@item c
+Compress the specified files (@code{dired-do-compress-to}) into a
+single archive anywhere on the file system. The compression algorithm
+is determined by the extension of the archive, see
+@code{dired-compress-files-alist}.
@findex epa-dired-do-decrypt
@kindex :d @r{(Dired)}
diff --git a/etc/NEWS b/etc/NEWS
index 0cb814b7eea..8672f9930c4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -282,6 +282,8 @@ many marked files into a single named archive. The compression
command is determined from the new `dired-compress-files-alist'
variable.
++++
+
* Editing Changes in Emacs 25.1
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 5cece27948f..46d40d2b41e 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -885,7 +885,7 @@ command with a prefix argument (the value does not matter)."
(defvar dired-compress-file-suffixes
'(
- ;; "tar -zxf" isn't used because it's not available the on
+ ;; "tar -zxf" isn't used because it's not available on the
;; Solaris10 version of tar. Solaris10 becomes obsolete in 2021.
;; Same thing on AIX 7.1.
("\\.tar\\.gz\\'" "" "gzip -dc %i | tar -xv")
diff --git a/lisp/dired.el b/lisp/dired.el
index bc0139f84e5..0fe23497912 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3897,7 +3897,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
;;; Start of automatically extracted autoloads.
-;;;### (autoloads nil "dired-aux" "dired-aux.el" "b946c1770b736ddc39eeef00c39425e7")
+;;;### (autoloads nil "dired-aux" "dired-aux.el" "ce82e4e2d385923def05089e8aedb519")
;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "dired-aux" "\