aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2019-12-09 00:45:50 +0200
committerJuri Linkov2019-12-09 00:45:50 +0200
commit7c2c24a1aa0df7cc683dbe5ab261a0b0f11b2fc0 (patch)
treecdd77e424c4dc00470c4496ba90fd2658a630ee8
parent252e5a88523e119475cfee933b161fdd0b977831 (diff)
downloademacs-7c2c24a1aa0df7cc683dbe5ab261a0b0f11b2fc0.tar.gz
emacs-7c2c24a1aa0df7cc683dbe5ab261a0b0f11b2fc0.zip
* doc/emacs/mini.texi (Minibuffer Edit): Add minibuffer-depth-indicate-mode.
* doc/emacs/search.texi (Regexp Backslash): Change xref from "(elisp) Syntax Tables" to "(elisp) Syntax Class Table". * doc/lispref/display.texi (Other Display Specs): Change xref from "Images" to "Image Descriptors". (bug#38519)
-rw-r--r--doc/emacs/mini.texi4
-rw-r--r--doc/emacs/search.texi2
-rw-r--r--doc/lispref/display.texi2
3 files changed, 6 insertions, 2 deletions
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 820d3baad13..bf969dd02d2 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -222,9 +222,13 @@ can also scroll the help text with @kbd{M-@key{PageUp}} and
222possible completions. @xref{Other Window}. 222possible completions. @xref{Other Window}.
223 223
224@vindex enable-recursive-minibuffers 224@vindex enable-recursive-minibuffers
225@findex minibuffer-depth-indicate-mode
225 Emacs normally disallows most commands that use the minibuffer while 226 Emacs normally disallows most commands that use the minibuffer while
226the minibuffer is active. To allow such commands in the minibuffer, 227the minibuffer is active. To allow such commands in the minibuffer,
227set the variable @code{enable-recursive-minibuffers} to @code{t}. 228set the variable @code{enable-recursive-minibuffers} to @code{t}.
229You might need also to enable @code{minibuffer-depth-indicate-mode}
230to show the current recursion depth in the minibuffer prompt
231on recursive use of the minibuffer.
228 232
229@findex minibuffer-inactive-mode 233@findex minibuffer-inactive-mode
230 When not active, the minibuffer is in @code{minibuffer-inactive-mode}, 234 When not active, the minibuffer is in @code{minibuffer-inactive-mode},
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 38ef49ed64d..c0aaf6eda92 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1199,7 +1199,7 @@ symbol-constituent character.
1199matches any character whose syntax is @var{c}. Here @var{c} is a 1199matches any character whose syntax is @var{c}. Here @var{c} is a
1200character that designates a particular syntax class: thus, @samp{w} 1200character that designates a particular syntax class: thus, @samp{w}
1201for word constituent, @samp{-} or @samp{ } for whitespace, @samp{.} 1201for word constituent, @samp{-} or @samp{ } for whitespace, @samp{.}
1202for ordinary punctuation, etc. @xref{Syntax Tables,, Syntax Tables, 1202for ordinary punctuation, etc. @xref{Syntax Class Table,, Syntax Class Table,
1203elisp, The Emacs Lisp Reference Manual}. 1203elisp, The Emacs Lisp Reference Manual}.
1204 1204
1205@item \S@var{c} 1205@item \S@var{c}
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index fa81b2e9538..ea3fa6f9b11 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4913,7 +4913,7 @@ Recursive display specifications are not supported---@var{string}'s
4913@code{display} properties, if any, are not used. 4913@code{display} properties, if any, are not used.
4914 4914
4915@item (image . @var{image-props}) 4915@item (image . @var{image-props})
4916This kind of display specification is an image descriptor (@pxref{Images}). 4916This kind of display specification is an image descriptor (@pxref{Image Descriptors}).
4917When used as a display specification, it means to display the image 4917When used as a display specification, it means to display the image
4918instead of the text that has the display specification. 4918instead of the text that has the display specification.
4919 4919