diff options
author | Stefan Kangas <stefankangas@gmail.com> | 2022-11-04 06:31:49 +0100 |
---|---|---|
committer | Stefan Kangas <stefankangas@gmail.com> | 2022-11-04 06:31:49 +0100 |
commit | 96436a125dad5cbae888e8385be2a79ef48d5d03 (patch) | |
tree | d50d883f72a792c36d1e0aac3fcfe471747eaa49 | |
parent | 5e7d08ae1378771f44f1e3a6840bd81a3bbb7fa7 (diff) | |
parent | 8cae9d8bd843398010c41b1bf6d96c20937ab38f (diff) | |
download | emacs-96436a125dad5cbae888e8385be2a79ef48d5d03.tar.gz |
Merge from origin/emacs-28
8cae9d8bd8 ; * doc/emacs/search.texi (Lax Search): Improve wording. ...
e01e8a8f84 ; * lisp/dired-aux.el (dired-show-file-type): Doc fix.
-rw-r--r-- | doc/emacs/search.texi | 25 | ||||
-rw-r--r-- | lisp/dired-aux.el | 6 |
2 files changed, 16 insertions, 15 deletions
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 582e764c55f..0090bc34005 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1348,18 +1348,19 @@ tailor them to your needs. @kindex SPC @r{(Incremental search)} @findex isearch-toggle-lax-whitespace @vindex search-whitespace-regexp - By default, search commands perform @dfn{lax space matching}: -each space, or sequence of spaces, matches any sequence of one or more -whitespace characters in the text. (Incremental regexp search has a -separate default; see @ref{Regexp Search}.) Hence, @w{@samp{foo bar}} -matches @w{@samp{foo bar}}, @w{@samp{foo@ @ bar}}, -@w{@samp{foo@ @ @ bar}}, and so on (but not @samp{foobar}). More -precisely, Emacs matches each sequence of space characters in the -search string to a regular expression specified by the variable -@code{search-whitespace-regexp}. For example, to make spaces match -sequences of newlines as well as spaces, set it to the regular expression -@samp{[[:space:]\n]+}. The default value of this variable considers -any sequence of spaces and tab characters as whitespace. + By default, search commands perform @dfn{lax space matching}: each +space, or sequence of spaces, matches any sequence of one or more +whitespace characters in the text. More precisely, Emacs matches each +sequence of space characters in the search string to a regular +expression specified by the user option +@code{search-whitespace-regexp}. The default value of this option +considers any sequence of spaces and tab characters as whitespace. +Hence, @w{@samp{foo bar}} matches @w{@samp{foo bar}}, @w{@samp{foo@ @ +bar}}, @w{@samp{foo@ @ @ bar}}, and so on (but not @samp{foobar}). If +you want to make spaces match sequences of newlines as well as spaces +and tabs, customize the option to make its value be the regular +expression @samp{[[:space:]\n]+}. (The default behavior of the +incremental regexp search is different; see @ref{Regexp Search}.) If you want whitespace characters to match exactly, you can turn lax space matching off by typing @kbd{M-s @key{SPC}} diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 327a4f038b2..29f973e506a 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -3718,9 +3718,9 @@ function works." ;;;###autoload (defun dired-show-file-type (file &optional deref-symlinks) "Print the type of FILE, according to the `file' command. -If you give a prefix to this command, and FILE is a symbolic -link, then the type of the file linked to by FILE is printed -instead." +If you give a prefix argument \\[universal-argument] to this command, and +FILE is a symbolic link, then the command will print the type +of the target of the link instead." (interactive (list (dired-get-filename t) current-prefix-arg)) (let (process-file-side-effects) (with-temp-buffer |