[Emacs-diffs] Changes to emacs/lispref/text.texi,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   07/04/19 06:09:32

Index: text.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/text.texi,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- text.texi   11 Apr 2007 16:27:33 -0000      1.137
+++ text.texi   19 Apr 2007 06:09:32 -0000      1.138
@@ -3241,7 +3241,6 @@
 It is possible with @code{char-after} to examine characters at various
 buffer positions without moving point to those positions.  Only an
 actual change in the value of point runs these hook functions.
address@hidden table
 
 @defvar inhibit-point-motion-hooks
 When this variable is address@hidden, @code{point-left} and
@@ -3260,6 +3259,27 @@
 Manual}) provides an example.
 @end defvar
 
address@hidden composition
address@hidden composition @r{(text property)}
+This text property is used to display a sequence of characters as a
+single glyph composed from components.  For instance, Thai base
+consonant is composed with the following combining vowel as a single
+glyph.
+
+The value is a character or a sequence (vector, list, or
+string) of integers.
+
+If it is a character, it is an alternate character to display instead
+of the text in the region.
+
+If it is a string, it is an alternate character sequences to
+display.
+
+If it is a vector or list, it is a sequence of alternate
+characters interleaved with internal codes specifying how to
+compose the following character with the previous one.
address@hidden table
+
 @node Format Properties
 @subsection Formatted Text Properties