3 files changed, 44 insertions, 14 deletions

diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 2b0649cd924..811dab5cfa0 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1319,16 +1319,20 @@ count as blocks.
 @kindex S-mouse-2
 @table @kbd
 @item C-c @@ C-h
+@itemx C-c @@ C-d
 Hide the current block (@code{hs-hide-block}).
 @item C-c @@ C-s
 Show the current block (@code{hs-show-block}).
 @item C-c @@ C-c
+@itemx C-x @@ C-e
 Either hide or show the current block (@code{hs-toggle-hiding}).
 @item S-mouse-2
 Toggle hiding for the block you click on (@code{hs-mouse-toggle-hiding}).
 @item C-c @@ C-M-h
+@itemx C-c @@ C-t
 Hide all top-level blocks (@code{hs-hide-all}).
 @item C-c @@ C-M-s
+@itemx C-c @@ C-a
 Show all blocks in the buffer (@code{hs-show-all}).
 @item C-c @@ C-l
 Hide all blocks @var{n} levels below this block
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 63cc1c24374..7b334733d67 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1614,6 +1614,14 @@ to go back to the position of the previous occurrence (or what used to
 be an occurrence), in case you changed it by mistake or want to
 reexamine it.
 
+@item u
+to undo the last replacement and go back to where that replacement was
+made.
+
+@item U
+to undo all the replacements and go back to where the first
+replacement was made.
+
 @item C-r
 to enter a recursive editing level, in case the occurrence needs to be
 edited rather than just replaced with @var{newstring}.  When you are
diff --git a/etc/NEWS b/etc/NEWS
index 82778932ab1..357d528924f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -24,12 +24,15 @@ When you add a new item, use the appropriate mark if you are sure it applies,
 
 * Installation Changes in Emacs 26.1
 
+---
 ** By default libgnutls is now required when building Emacs.
 Use 'configure --with-gnutls=no' to build even when GnuTLS is missing.
 
+---
 ** GnuTLS version 2.12.2 or later is now required, instead of merely
 version 2.6.6 or later.
 
++++
 ** The new option 'configure --with-mailutils' causes Emacs to rely on
 GNU Mailutils to retrieve email.  It is recommended, and is the
 default if GNU Mailutils is installed.  When --with-mailutils is not
@@ -39,12 +42,14 @@ via insecure channels.  To avoid this problem, use either
 --with-mailutils or --without-pop when configuring; --without-pop
 is the default on platforms other than native MS-Windows.
 
+---
 ** The new option 'configure --enable-gcc-warnings=warn-only' causes
 GCC to issue warnings without stopping the build.  This behavior is
 now the default in developer builds.  As before, use
 '--disable-gcc-warnings' to suppress GCC's warnings, and
 '--enable-gcc-warnings' to stop the build if GCC issues warnings.
 
+---
 ** When GCC warnings are enabled, '--enable-check-lisp-object-type' is
 now enabled by default when configuring.
 
@@ -62,6 +67,7 @@ configure option '--disable-libsystemd'.
 (If your Emacs is installed in a non-standard location, you may
 need to copy the emacs.service file to eg ~/.config/systemd/user/)
 
+---
 ** New configure option '--disable-build-details' attempts to build an
 Emacs that is more likely to be reproducible; that is, if you build
 and install Emacs twice, the second Emacs is a copy of the first.
@@ -80,11 +86,13 @@ linked to Little CMS exposes color management functions in Lisp: the
 color metrics 'lcms-cie-de2000' and 'lcms-cam02-ucs', as well as
 functions for conversion to and from CIE CAM02 and CAM02-UCS.
 
+---
 ** The configure option '--with-gameuser' now defaults to 'no',
 as this appears to be the most common configuration in practice.
 When it is 'no', the shared game directory and the auxiliary program
 update-game-score are no longer needed and are not installed.
 
+---
 ** Emacs no longer works on IRIX.  We expect that Emacs users are not
 affected by this, as SGI stopped supporting IRIX in December 2013.
 
@@ -423,19 +431,28 @@ You can enable this by customizing 'mwheel-tilt-scroll-p'.  If you
 want to reverse the direction of the scroll, customize
 'mwheel-flip-direction'.
 
+** Emacsclient changes
+
 +++
-** Emacsclient has a new option '-u' / '--suppress-output'.
+*** Emacsclient has a new option '-u' / '--suppress-output'.
 This option suppresses display of return values from the server
 process.
 
 +++
-** Emacsclient has a new option '-T' / '--tramp'.
+*** Emacsclient has a new option '-T' / '--tramp'.
 This helps with using a local Emacs session as the server for a remote
 emacsclient.  With appropriate setup, one can now set the EDITOR
 environment variable on a remote machine to emacsclient, and
 use the local Emacs to edit remote files via Tramp.  See the node
 "(emacs) emacsclient Options" in the user manual for the details.
 
++++
+*** Emacsclient now accepts command-line options in ALTERNATE_EDITOR
+and '--alternate-editor'. For example, ALTERNATE_EDITOR="emacs -Q -nw".
+Arguments may be quoted "like this", so that for example an absolute
+path containing a space may be specified; quote escaping is not
+supported.
+
 ---
 ** New user option 'dig-program-options' and extended functionality
 for DNS-querying functions 'nslookup-host', 'dns-lookup-host',
@@ -488,13 +505,7 @@ line-number display in a window can use the new function
 Users and developers are encouraged to switch to this new feature
 instead.
 
-+++
-** emacsclient now accepts command-line options in ALTERNATE_EDITOR
-and '--alternate-editor'. For example, ALTERNATE_EDITOR="emacs -Q -nw".
-Arguments may be quoted "like this", so that for example an absolute
-path containing a space may be specified; quote escaping is not
-supported.
-
+---
 ** The new user option 'arabic-shaper-ZWNJ-handling' controls how to
 handle ZWNJ in Arabic text rendering.
 
@@ -587,6 +598,7 @@ Negative prefix arg flips the direction of selection.  Also,
 defun are selected unless they are separated from the defun by a blank
 line.
 
+---
 ** New command 'replace-buffer-contents'.
 This command replaces the contents of the accessible portion of the
 current buffer with the contents of the accessible portion of a
@@ -691,6 +703,10 @@ A new option 'ediff-show-ancestor' and a new toggle
 *** Key 'U' is bound to 'Buffer-menu-unmark-all' and key 'M-DEL' is
 bound to 'Buffer-menu-unmark-all-buffers'.
 
++++
+** hideshow mode got four key bindings that are analogous to outline
+mode bindings: 'C-c @ C-a', 'C-c @ C-t', 'C-c @ C-d', and 'C-c @ C-e'.
+
 ** bs
 
 ---
@@ -719,7 +735,6 @@ method is an NNTP select method.
 added: 'C-c C-s C-m C-m'.
 
 +++
-
 *** In 'message-citation-line-format' the '%Z' format is now the time
 zone name instead of the numeric form.  The '%z' format continues to
 be the numeric form.  The new behavior is compatible with
@@ -982,6 +997,7 @@ there are now top-level domains added all the time.  Message will no
 longer warn about sending emails to top-level domains it hasn't heard
 about.
 
+---
 *** 'message-beginning-of-line' (bound to 'C-a') understands folded headers.
 In 'visual-line-mode' it will look for the true beginning of a header
 while in non-'visual-line-mode' it will move the point to the indented
@@ -1188,8 +1204,10 @@ the previous behavior.
 
 * New Modes and Packages in Emacs 26.1
 
+---
 ** New Elisp data-structure library 'radix-tree'.
 
+---
 ** New library 'xdg' with utilities for some XDG standards and specs.
 
 ** HTML
@@ -1199,14 +1217,18 @@ the previous behavior.
 mode for *.html files.  This mode handles indentation,
 fontification, and commenting for embedded JavaScript and CSS.
 
+---
 ** New mode 'conf-toml-mode' is a sub-mode of 'conf-mode', specialized
 for editing TOML files.
 
+---
 ** New mode 'conf-desktop-mode' is a sub-mode of 'conf-unix-mode',
 specialized for editing freedesktop.org desktop entries.
 
+---
 ** New minor mode 'pixel-scroll-mode' provides smooth pixel-level scrolling.
 
+---
 ** New major mode 'less-css-mode' (a minor variant of 'css-mode') for
 editing Less files.
 
@@ -1245,10 +1267,6 @@ mode to send the same escape sequences that xterm does.  This makes
 things like 'forward-word' in readline work.
 
 ---
-** hideshow mode got four key bindings that are analogous to outline
-mode bindings: 'C-c @ C-a', 'C-c @ C-t', 'C-c @ C-d', and 'C-c @ C-e'.
-
----
 ** Customizable variable 'query-replace-from-to-separator'
 now doesn't propertize the string value of the separator.
 Instead, text properties are added by 'query-replace-read-from'.