aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-05-14 11:46:11 +0300
committerEli Zaretskii2011-05-14 11:46:11 +0300
commite3934a8a48bd8769619fc11355100e96cf5f74a5 (patch)
treea86969536d65c37a46c8ce8e68b05029c9470b61
parentc21edd3404252955dae90d2e2e1d0d412e39c39b (diff)
downloademacs-e3934a8a48bd8769619fc11355100e96cf5f74a5.tar.gz
emacs-e3934a8a48bd8769619fc11355100e96cf5f74a5.zip
Fix bug #8652 with indentation of variable docs.
doc/lispref/text.texi (Special Properties): Move @defvar's out of the @table.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/text.texi32
2 files changed, 23 insertions, 14 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index eb88c6ba4f9..6a4fa03e741 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12011-05-14 Eli Zaretskii <eliz@gnu.org>
2
3 * text.texi (Special Properties): Move @defvar's out of the
4 @table. (Bug#8652)
5
12011-05-12 Glenn Morris <rgm@gnu.org> 62011-05-12 Glenn Morris <rgm@gnu.org>
2 7
3 * display.texi (Image Descriptors): Fix typo. (Bug#8495) 8 * display.texi (Image Descriptors): Fix typo. (Bug#8495)
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 3ff2697dd37..6cb271eec88 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -3272,15 +3272,28 @@ functions (which may be the same function). In any case, all the
3272@code{point-left} functions are called first, followed by all the 3272@code{point-left} functions are called first, followed by all the
3273@code{point-entered} functions. 3273@code{point-entered} functions.
3274 3274
3275It is possible with @code{char-after} to examine characters at various 3275It is possible to use @code{char-after} to examine characters at various
3276buffer positions without moving point to those positions. Only an 3276buffer positions without moving point to those positions. Only an
3277actual change in the value of point runs these hook functions. 3277actual change in the value of point runs these hook functions.
3278 3278
3279The variable @code{inhibit-point-motion-hooks} can inhibit running the
3280@code{point-left} and @code{point-entered} hooks, see @ref{Inhibit
3281point motion hooks}.
3282
3283@item composition
3284@kindex composition @r{(text property)}
3285This text property is used to display a sequence of characters as a
3286single glyph composed from components. But the value of the property
3287itself is completely internal to Emacs and should not be manipulated
3288directly by, for instance, @code{put-text-property}.
3289
3290@end table
3291
3279@defvar inhibit-point-motion-hooks 3292@defvar inhibit-point-motion-hooks
3280When this variable is non-@code{nil}, @code{point-left} and 3293@anchor{Inhibit point motion hooks} When this variable is
3281@code{point-entered} hooks are not run, and the @code{intangible} 3294non-@code{nil}, @code{point-left} and @code{point-entered} hooks are
3282property has no effect. Do not set this variable globally; bind it with 3295not run, and the @code{intangible} property has no effect. Do not set
3283@code{let}. 3296this variable globally; bind it with @code{let}.
3284@end defvar 3297@end defvar
3285 3298
3286@defvar show-help-function 3299@defvar show-help-function
@@ -3293,15 +3306,6 @@ string to display. Tooltip mode (@pxref{Tooltips,,, emacs, The GNU Emacs
3293Manual}) provides an example. 3306Manual}) provides an example.
3294@end defvar 3307@end defvar
3295 3308
3296@item composition
3297@kindex composition @r{(text property)}
3298This text property is used to display a sequence of characters as a
3299single glyph composed from components. But the value of the property
3300itself is completely internal to Emacs and should not be manipulated
3301directly by, for instance, @code{put-text-property}.
3302
3303@end table
3304
3305@node Format Properties 3309@node Format Properties
3306@subsection Formatted Text Properties 3310@subsection Formatted Text Properties
3307 3311