summaryrefslogtreecommitdiff
path: root/doc/emacs/programs.texi
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-03-08 08:29:14 -0800
committerGlenn Morris <rgm@gnu.org>2018-03-08 08:29:14 -0800
commit43548b51cb94c15af41b61b90172e05b9443a39b (patch)
tree02b92328987a8c98f4e73a4081fb310ae1c83693 /doc/emacs/programs.texi
parent50e2c0fb5180a757d8d533518f68837ffe5909be (diff)
parentcb0d40eab406e7df22b09f7ae5557c820c087af4 (diff)
downloademacs-43548b51cb94c15af41b61b90172e05b9443a39b.tar.gz
emacs-43548b51cb94c15af41b61b90172e05b9443a39b.tar.bz2
emacs-43548b51cb94c15af41b61b90172e05b9443a39b.zip
Merge from origin/emacs-26
cb0d40e (origin/emacs-26) Minor change in the manual 7e26d83 More minor changes in the manual 6851754 Replace some obsolete aliases in code 6bcb48c Replace some obsolete aliases in documentation 317da2a Minor improvements in manuals 61c1f80 Minor copyedits in display.texi d523e4a Remove some unused spam.el variables 501808c Replace some obsolete aliases in code 19afff3 Replace some obsolete aliases in documentation c797bc9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 0efe0bd Obsolete eshell-cmpl-suffix-list add48d2 More minor changes in the Glossary of the Emacs manual f6bd7e0 Revert last commit af4697f Define if-let* and derivatives as aliases for if-let etc ec79bdc Minor fix in Emacs manual's Glossary
Diffstat (limited to 'doc/emacs/programs.texi')
-rw-r--r--doc/emacs/programs.texi6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index be471099a57..49d1b9d2b11 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -815,11 +815,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}
@@ -828,10 +830,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,