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

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  07/02/14 11:31:28

Index: display.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/display.texi,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -b -r1.248 -r1.249
--- display.texi        10 Feb 2007 12:04:34 -0000      1.248
+++ display.texi        14 Feb 2007 11:31:28 -0000      1.249
@@ -5266,26 +5266,32 @@
 
 @cindex glyph
   A @dfn{glyph} is a generalization of a character; it stands for an
-image that takes up a single character position on the screen.  Glyphs
-are represented in Lisp as integers, just as characters are.  Normally
+image that takes up a single character position on the screen.  Normally
 glyphs come from vectors in the display table (@pxref{Display Tables}).
 
-  A glyph code can be @dfn{simple} or it can be defined by the
address@hidden table}.  A simple glyph code is just a way of specifying a
-character and a face to output it in.  When a glyph code is simple,
-the code, mod 524288, is the character to output, and the code divided
-by 524288 specifies the face number (@pxref{Face Functions}) to use
-while outputting it.  (524288 is
address@hidden
-2**19.)
address@hidden ifnottex
address@hidden
-$2^{19}$.)
address@hidden tex
address@hidden
+  A glyph is represented in Lisp as a @dfn{glyph code}.  A glyph code
+can be @dfn{simple} or it can be defined by the @dfn{glyph table}.  A
+simple glyph code is just a way of specifying a character and a face
+to output it in.  @xref{Faces}.
+
+  The following functions are used to manipulate simple glyph codes:
+
address@hidden make-glyph-code char &optional face
+This function returns a simple glyph code representing char @var{char}
+with face @var{face}.
address@hidden defun
+
address@hidden glyph-char glyph
+This function returns the character of simple glyph code @var{glyph}.
address@hidden defun
+
address@hidden glyph-face glyph
+This function returns face of simple glyph code @var{glyph}, or
address@hidden if @var{glyph} has the default face (face-id 0).
address@hidden defun
 
   On character terminals, you can set up a @dfn{glyph table} to define
-the meaning of glyph codes.
+the meaning of glyph codes (represented as small integers).
 
 @defvar glyph-table
 The value of this variable is the current glyph table.  It should be
@@ -5307,10 +5313,10 @@
 Send the characters in @var{string} to the terminal to output
 this glyph code.
 
address@hidden @var{integer}
-Define this glyph code as an alias for glyph code @var{integer}.  You
-can use such an alias to define a small-numbered glyph code which
-specifies a face.
address@hidden @var{code}
+Define this glyph code as an alias for glyph code @var{code} created
+by @code{make-glyph-code}.  You can use such an alias to define a
+small-numbered glyph code which specifies a character with a face.
 
 @item @code{nil}
 This glyph code is simple.