[Emacs-diffs] master 644a308 4/4: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 644a308b4e1513e04be9360e1586e14b32ec0159
Merge: 37b8213 936a8f3
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    936a8f3 (origin/emacs-26) Document Emacs 26 behavior of Dired's 'Z' o...
    99f99a1 ; Minor editing change in windows.texi
    13bb665 Fix a typo in the Emacs manual
    
    # Conflicts:
    #   etc/NEWS
---
 doc/emacs/dired.texi   | 10 ++++++++--
 doc/emacs/rmail.texi   |  2 +-
 doc/emacs/windows.texi |  2 +-
 etc/NEWS.26            | 10 ++++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 1b03a39..1612fc7 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -779,9 +779,15 @@ suitable guess made using the variables @code{lpr-command} 
and
 @item Z
 Compress the specified files (@code{dired-do-compress}).  If the file
 appears to be a compressed file already, uncompress it instead.  Each
-marked file is compressed into its own archive.  This uses the
+marked file is compressed into its own archive; this uses the
 @command{gzip} program if it is available, otherwise it uses
address@hidden
address@hidden  On a directory name, this command produces a
+compressed @file{.tar.gz} archive containing all of the directory's
+files, by running the @command{tar} command with output piped to
address@hidden  To allow decompression of compressed directories,
+typing @kbd{Z} on a @file{.tar.gz} or @file{.tgz} archive file unpacks
+all the files in the archive into a directory whose name is the
+archive name with the extension removed.
 
 @findex dired-do-compress-to
 @kindex c @r{(Dired)}
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index a17ef49..c975b58 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -318,7 +318,7 @@ effect of a @kbd{d} command in most cases.  It undeletes 
the current
 message if the current message is deleted.  Otherwise it moves backward
 to previous messages until a deleted message is found, and undeletes
 that message.  A numeric prefix argument serves as a repeat count, to
-allow deletion of several messages in a single command.
+allow undeletion of several messages in a single command.
 
   You can usually undo a @kbd{d} with a @kbd{u} because the @kbd{u}
 moves back to and undeletes the message that the @kbd{d} deleted.  But
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 8cc5144..93a68e9 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -553,7 +553,7 @@ buffer.  @xref{Follow Mode}.
 between neighboring windows in a frame.  @kbd{M-x windmove-right}
 selects the window immediately to the right of the currently selected
 one, and similarly for the left, up, and down
-counterparts.  @kbd{M-x windmove-default-keybindings} binds these
+counterparts.  @address@hidden windmove-default-keybindings}} binds these
 commands to @kbd{S-right} etc.; doing so disables shift selection for
 those keys (@pxref{Shift Selection}).
 
diff --git a/etc/NEWS.26 b/etc/NEWS.26
index 6dba2a9..4197317 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -51,6 +51,16 @@ often cause crashes.  Set it to nil if you really need those 
fonts.
 
 * Changes in Specialized Modes and Packages in Emacs 26.2
 
+** Dired
++++
+*** The 'Z' command on a directory name compresses all of its files.
+It produces a compressed '.tar.gz' archive with all the files in the
+directory and all of its subdirectories.  For symmetry, 'Z' on a
+'.tar.gz' or a '.tgz' archive extracts all the archived files into a
+directory whose name is the archive name sans the '.tar.gz' or '.tgz'
+extension.  (This change was actually made in Emacs 26.1, but was not
+called out in its NEWS.)
+
 ** Ibuffer
 
 ---