master d65a5148b1a: ; Fix recently-installed documentation
Eli Zaretskii <[email protected]>
| Newsgroups | gmane.emacs.diffs |
|---|---|
| Message-ID | <[email protected]> |
branch: master commit d65a5148b1accd52196e4ffc217e6513d349f33f Author: Eli Zaretskii <[email protected]> Commit: Eli Zaretskii <[email protected]> ; Fix recently-installed documentation * lisp/replace.el (query-replace-show-preview) (replace-preview-cleanup): * doc/emacs/search.texi (Replace): Improve wording of documentation of the query-replace preview feature. --- doc/emacs/search.texi | 12 ++++++------ lisp/replace.el | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 38ce36ee017..265a6a33f97 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1565,15 +1565,15 @@ is possible to perform several replacements in parallel, using the command @code{expand-region-abbrevs} (@pxref{Expanding Abbrevs}). @cindex preview of replacement text -@cindex @code{query-replace-preview} face +@vindex query-replace-preview@r{ face} @vindex query-replace-show-preview If you set @code{query-replace-show-preview} to a non-@code{nil} -value, the replace commands preview the replacement while you type it: -the matches visible in the window are displayed as they would look -after the replacement, using the face @code{query-replace-preview}. +value, the replace commands shows a preview of the replacement while +you type it: the matches visible in the window are displayed as they +would look after the replacement, using the face @code{query-replace-preview}. This tells you what back-references like @samp{\1} (@pxref{Regexp -Replace}) expand to before you commit to the edit. Replacements that -use @samp{\,} or @samp{\#} are not previewed. +Replace}) expand to before you commit to the replacement. However, +replacements that use @samp{\,} or @samp{\#} are not previewed. @menu * Unconditional Replace:: Replacing all matches for a string. diff --git a/lisp/replace.el b/lisp/replace.el index 0101978439f..4bdb80dc531 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -115,11 +115,11 @@ This variable affects only `query-replace-regexp'." :version "23.1") (defcustom query-replace-show-preview nil - "Non-nil means preview the replacement while you type it. -The matches visible in the window are shown as they would look after + "Non-nil means show preview of the result of replacement while you type it. +The matches that are visible in the window are shown as they would look after the replacement, using the `query-replace-preview' face. This tells you what back-references like \\1 expand to before you commit to the -edit. Replacements that use \\, or \\# are never previewed." +edit. However, replacements that use \\, or \\# are not previewed." :type 'boolean :group 'matching :version "32.1") @@ -368,7 +368,7 @@ the original string if not." "List of overlays used to preview the replacement text.") (defun replace-preview-cleanup () - "Remove the overlays that preview the replacement text." + "Remove the overlays shoowing the preview of the replacement text." (mapc #'delete-overlay replace-preview-overlays) (setq replace-preview-overlays nil))