diff options
| author | Eli Zaretskii | 2018-03-07 21:51:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2018-03-07 21:51:59 +0200 |
| commit | 317da2ace54e971c788d4718874df957d3d1c549 (patch) | |
| tree | 683a9cad46c50529a5dc4133cfa42b0137c5c300 /doc | |
| parent | 61c1f80f0544b3da784f97ec2368aec809c8524b (diff) | |
| download | emacs-317da2ace54e971c788d4718874df957d3d1c549.tar.gz emacs-317da2ace54e971c788d4718874df957d3d1c549.zip | |
Minor improvements in manuals
* doc/lispref/variables.texi (Local Variables): Make more clear
that local bindings of 'let' are in effect only within the body.
Suggested by Marcin Borkowski <mbork@mbork.pl>, see
http://lists.gnu.org/archive/html/emacs-devel/2018-03/msg00217.html
for the details.
* doc/emacs/programs.texi (Matching): Fix a typo. Reported by
Alex Branham <alex.branham@gmail.com> in emacs-manual-bugs@gnu.org.
Improve indexing.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/programs.texi | 6 | ||||
| -rw-r--r-- | doc/lispref/variables.texi | 5 |
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: | |||
| 849 | 849 | ||
| 850 | @itemize @bullet | 850 | @itemize @bullet |
| 851 | @item | 851 | @item |
| 852 | @code{show-paren-highlight-open-paren} controls whether to highlight | 852 | @vindex show-paren-highlight-openparen |
| 853 | @code{show-paren-highlight-openparen} controls whether to highlight | ||
| 853 | an open paren when point stands just before it, and hence its position | 854 | an open paren when point stands just before it, and hence its position |
| 854 | is marked by the cursor anyway. The default is non-@code{nil} (yes). | 855 | is marked by the cursor anyway. The default is non-@code{nil} (yes). |
| 855 | 856 | ||
| 856 | @item | 857 | @item |
| 858 | @vindex show-paren-style | ||
| 857 | @code{show-paren-style} controls whether just the two parens, or also | 859 | @code{show-paren-style} controls whether just the two parens, or also |
| 858 | the space between them get highlighted. The valid options here are | 860 | the space between them get highlighted. The valid options here are |
| 859 | @code{parenthesis} (show the matching paren), @code{expression} | 861 | @code{parenthesis} (show the matching paren), @code{expression} |
| @@ -862,10 +864,12 @@ the space between them get highlighted. The valid options here are | |||
| 862 | expression otherwise). | 864 | expression otherwise). |
| 863 | 865 | ||
| 864 | @item | 866 | @item |
| 867 | @vindex show-paren-when-point-inside-paren | ||
| 865 | @code{show-paren-when-point-inside-paren}, when non-@code{nil}, causes | 868 | @code{show-paren-when-point-inside-paren}, when non-@code{nil}, causes |
| 866 | highlighting also when point is on the inside of a parenthesis. | 869 | highlighting also when point is on the inside of a parenthesis. |
| 867 | 870 | ||
| 868 | @item | 871 | @item |
| 872 | @vindex show-paren-when-point-in-periphery | ||
| 869 | @code{show-paren-when-point-in-periphery}, when non-@code{nil}, causes | 873 | @code{show-paren-when-point-in-periphery}, when non-@code{nil}, causes |
| 870 | highlighting also when point is in whitespace at the beginning or end | 874 | highlighting also when point is in whitespace at the beginning or end |
| 871 | of a line, and there is a paren at, respectively, the first or last, | 875 | 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 | |||
| 165 | function call; these local bindings take effect within the body of the | 165 | function call; these local bindings take effect within the body of the |
| 166 | function. To take another example, the @code{let} special form | 166 | function. To take another example, the @code{let} special form |
| 167 | explicitly establishes local bindings for specific variables, which | 167 | explicitly establishes local bindings for specific variables, which |
| 168 | take effect within the body of the @code{let} form. | 168 | take effect only within the body of the @code{let} form. |
| 169 | 169 | ||
| 170 | We also speak of the @dfn{global binding}, which is where | 170 | We also speak of the @dfn{global binding}, which is where |
| 171 | (conceptually) the global value is kept. | 171 | (conceptually) the global value is kept. |
| @@ -204,7 +204,8 @@ bindings: | |||
| 204 | This special form sets up local bindings for a certain set of | 204 | This special form sets up local bindings for a certain set of |
| 205 | variables, as specified by @var{bindings}, and then evaluates all of | 205 | variables, as specified by @var{bindings}, and then evaluates all of |
| 206 | the @var{forms} in textual order. Its return value is the value of | 206 | the @var{forms} in textual order. Its return value is the value of |
| 207 | the last form in @var{forms}. | 207 | the last form in @var{forms}. The local bindings set up by @code{let} |
| 208 | will be in effect only within the body of @var{forms}. | ||
| 208 | 209 | ||
| 209 | Each of the @var{bindings} is either @w{(i) a} symbol, in which case | 210 | Each of the @var{bindings} is either @w{(i) a} symbol, in which case |
| 210 | that symbol is locally bound to @code{nil}; or @w{(ii) a} list of the | 211 | that symbol is locally bound to @code{nil}; or @w{(ii) a} list of the |