summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/programs.texi6
-rw-r--r--doc/lispref/variables.texi5
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index c34b55fc00e..d3d7028c149 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -849,11 +849,13 @@ options which control the operation of this mode include:
@itemize @bullet
@item
-@code{show-paren-highlight-open-paren} controls whether to highlight
+@vindex show-paren-highlight-openparen
+@code{show-paren-highlight-openparen} controls whether to highlight
an open paren when point stands just before it, and hence its position
is marked by the cursor anyway. The default is non-@code{nil} (yes).
@item
+@vindex show-paren-style
@code{show-paren-style} controls whether just the two parens, or also
the space between them get highlighted. The valid options here are
@code{parenthesis} (show the matching paren), @code{expression}
@@ -862,10 +864,12 @@ the space between them get highlighted. The valid options here are
expression otherwise).
@item
+@vindex show-paren-when-point-inside-paren
@code{show-paren-when-point-inside-paren}, when non-@code{nil}, causes
highlighting also when point is on the inside of a parenthesis.
@item
+@vindex show-paren-when-point-in-periphery
@code{show-paren-when-point-in-periphery}, when non-@code{nil}, causes
highlighting also when point is in whitespace at the beginning or end
of a line, and there is a paren at, respectively, the first or last,
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index e025d3fd10b..aecee6f3056 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -165,7 +165,7 @@ receive local values, which are the actual arguments supplied to the
function call; these local bindings take effect within the body of the
function. To take another example, the @code{let} special form
explicitly establishes local bindings for specific variables, which
-take effect within the body of the @code{let} form.
+take effect only within the body of the @code{let} form.
We also speak of the @dfn{global binding}, which is where
(conceptually) the global value is kept.
@@ -204,7 +204,8 @@ bindings:
This special form sets up local bindings for a certain set of
variables, as specified by @var{bindings}, and then evaluates all of
the @var{forms} in textual order. Its return value is the value of
-the last form in @var{forms}.
+the last form in @var{forms}. The local bindings set up by @code{let}
+will be in effect only within the body of @var{forms}.
Each of the @var{bindings} is either @w{(i) a} symbol, in which case
that symbol is locally bound to @code{nil}; or @w{(ii) a} list of the