diff options
| author | Oleh Krehel | 2015-10-22 12:05:59 +0200 |
|---|---|---|
| committer | Oleh Krehel | 2015-10-22 12:53:21 +0200 |
| commit | 717e7a4e8f2f6aa6ae0be33783d208394eef4a0f (patch) | |
| tree | ccbd8bf86e41693956d12177c0707ec933c022a5 | |
| parent | 01d2af9c7c9d0720022f027838d17123ca2c9cc2 (diff) | |
| download | emacs-717e7a4e8f2f6aa6ae0be33783d208394eef4a0f.tar.gz emacs-717e7a4e8f2f6aa6ae0be33783d208394eef4a0f.zip | |
Describe dired-do-compress-to in the manual
* etc/NEWS: Update.
* lisp/dired-aux.el: Fix typo.
* doc/emacs/dired.texi: Add entry.
| -rw-r--r-- | doc/emacs/dired.texi | 12 | ||||
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/dired-aux.el | 2 | ||||
| -rw-r--r-- | lisp/dired.el | 2 |
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 | |||
| 722 | @cindex compressing files (in Dired) | 722 | @cindex compressing files (in Dired) |
| 723 | @item Z | 723 | @item Z |
| 724 | Compress the specified files (@code{dired-do-compress}). If the file | 724 | Compress the specified files (@code{dired-do-compress}). If the file |
| 725 | appears to be a compressed file already, uncompress it instead. | 725 | appears to be a compressed file already, uncompress it instead. Each |
| 726 | marked file is compressed into its own archive. | ||
| 727 | |||
| 728 | @findex dired-do-compress-to | ||
| 729 | @kindex c @r{(Dired)} | ||
| 730 | @cindex compressing files (in Dired) | ||
| 731 | @item c | ||
| 732 | Compress the specified files (@code{dired-do-compress-to}) into a | ||
| 733 | single archive anywhere on the file system. The compression algorithm | ||
| 734 | is determined by the extension of the archive, see | ||
| 735 | @code{dired-compress-files-alist}. | ||
| 726 | 736 | ||
| 727 | @findex epa-dired-do-decrypt | 737 | @findex epa-dired-do-decrypt |
| 728 | @kindex :d @r{(Dired)} | 738 | @kindex :d @r{(Dired)} |
| @@ -282,6 +282,8 @@ many marked files into a single named archive. The compression | |||
| 282 | command is determined from the new `dired-compress-files-alist' | 282 | command is determined from the new `dired-compress-files-alist' |
| 283 | variable. | 283 | variable. |
| 284 | 284 | ||
| 285 | +++ | ||
| 286 | |||
| 285 | 287 | ||
| 286 | * Editing Changes in Emacs 25.1 | 288 | * Editing Changes in Emacs 25.1 |
| 287 | 289 | ||
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)." | |||
| 885 | 885 | ||
| 886 | (defvar dired-compress-file-suffixes | 886 | (defvar dired-compress-file-suffixes |
| 887 | '( | 887 | '( |
| 888 | ;; "tar -zxf" isn't used because it's not available the on | 888 | ;; "tar -zxf" isn't used because it's not available on the |
| 889 | ;; Solaris10 version of tar. Solaris10 becomes obsolete in 2021. | 889 | ;; Solaris10 version of tar. Solaris10 becomes obsolete in 2021. |
| 890 | ;; Same thing on AIX 7.1. | 890 | ;; Same thing on AIX 7.1. |
| 891 | ("\\.tar\\.gz\\'" "" "gzip -dc %i | tar -xv") | 891 | ("\\.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." | |||
| 3897 | 3897 | ||
| 3898 | ;;; Start of automatically extracted autoloads. | 3898 | ;;; Start of automatically extracted autoloads. |
| 3899 | 3899 | ||
| 3900 | ;;;### (autoloads nil "dired-aux" "dired-aux.el" "b946c1770b736ddc39eeef00c39425e7") | 3900 | ;;;### (autoloads nil "dired-aux" "dired-aux.el" "ce82e4e2d385923def05089e8aedb519") |
| 3901 | ;;; Generated autoloads from dired-aux.el | 3901 | ;;; Generated autoloads from dired-aux.el |
| 3902 | 3902 | ||
| 3903 | (autoload 'dired-diff "dired-aux" "\ | 3903 | (autoload 'dired-diff "dired-aux" "\ |