aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDmitry Gutov2014-03-15 05:07:06 +0200
committerDmitry Gutov2014-03-15 05:07:06 +0200
commit480d4f5784c64a3d379a3ebfe302612a7f63a77d (patch)
tree453f607a9b25b0171e65ef14922e198b86844763 /doc
parent881033454ae8f1d6d0dd8bb3e28ffc7637a6e48a (diff)
downloademacs-480d4f5784c64a3d379a3ebfe302612a7f63a77d.tar.gz
emacs-480d4f5784c64a3d379a3ebfe302612a7f63a77d.zip
Update `blink-matching-paren' in the manual
* doc/emacs/programs.texi (Matching): Update WRT to the new `blink-matchin-paren' behavior. * doc/lispref/display.texi (Blinking): Update WRT to the new `blink-matchin-paren' behavior.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/programs.texi10
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/display.texi17
4 files changed, 24 insertions, 13 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 6a57c9fbc89..bef70ec7181 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12014-03-15 Dmitry Gutov <dgutov@yandex.ru>
2
3 * programs.texi (Matching): Update WRT to the new
4 `blink-matchin-paren' behavior.
5
12014-03-13 Paul Eggert <eggert@cs.ucla.edu> 62014-03-13 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * mule.texi (International, Language Environments): Update 8 * mule.texi (International, Language Environments): Update
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 1cbf61970c0..8cc2f713c4b 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -813,13 +813,13 @@ as in @samp{[x)}---a warning message is displayed in the echo area.
813@itemize @bullet 813@itemize @bullet
814@item 814@item
815@code{blink-matching-paren} turns the feature on or off: @code{nil} 815@code{blink-matching-paren} turns the feature on or off: @code{nil}
816disables it, but the default is @code{t} to enable it. 816disables it, but the default is @code{t} to enable it. Set it to
817@code{jump} to make indication work through cursor movement.
817 818
818@item 819@item
819@code{blink-matching-delay} says how many seconds to leave the cursor 820@code{blink-matching-delay} says how many seconds to keep indicating
820on the matching opening delimiter, before bringing it back to the real 821the matching opening delimiter. This may be an integer or
821location of point. This may be an integer or floating-point number; 822floating-point number; the default is 1.
822the default is 1.
823 823
824@item 824@item
825@code{blink-matching-paren-distance} specifies how many characters 825@code{blink-matching-paren-distance} specifies how many characters
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 047a7c6f3b7..13b96b4ba5e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12014-03-15 Dmitry Gutov <dgutov@yandex.ru>
2
3 * display.texi (Blinking): Update WRT to the new
4 `blink-matchin-paren' behavior.
5
12014-03-14 Martin Rudalics <rudalics@gmx.at> 62014-03-14 Martin Rudalics <rudalics@gmx.at>
2 7
3 * display.texi (Temporary Displays): Say that 8 * display.texi (Temporary Displays): Say that
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 5037f0c9032..27f002fe5fe 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5957,18 +5957,19 @@ parenthesis before giving up.
5957@end defopt 5957@end defopt
5958 5958
5959@defopt blink-matching-delay 5959@defopt blink-matching-delay
5960This variable specifies the number of seconds for the cursor to remain 5960This variable specifies the number of seconds to keep indicating the
5961at the matching parenthesis. A fraction of a second often gives 5961matching parenthesis. A fraction of a second often gives good
5962good results, but the default is 1, which works on all systems. 5962results, but the default is 1, which works on all systems.
5963@end defopt 5963@end defopt
5964 5964
5965@deffn Command blink-matching-open 5965@deffn Command blink-matching-open
5966This function is the default value of @code{blink-paren-function}. It 5966This function is the default value of @code{blink-paren-function}. It
5967assumes that point follows a character with close parenthesis syntax and 5967assumes that point follows a character with close parenthesis syntax
5968moves the cursor momentarily to the matching opening character. If that 5968and applies the appropriate effect momentarily to the matching opening
5969character is not already on the screen, it displays the character's 5969character. If that character is not already on the screen, it
5970context in the echo area. To avoid long delays, this function does not 5970displays the character's context in the echo area. To avoid long
5971search farther than @code{blink-matching-paren-distance} characters. 5971delays, this function does not search farther than
5972@code{blink-matching-paren-distance} characters.
5972 5973
5973Here is an example of calling this function explicitly. 5974Here is an example of calling this function explicitly.
5974 5975