[Emacs-diffs] trunk r114966: Doc fix.

[Xue Fuqiao]

------------------------------------------------------------
revno: 114966
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Tue 2013-11-05 17:00:52 +0800
message:
  Doc fix.
  
  * doc/lispref/display.texi (Glyphs): Add an index for glyph code.
  
  * src/xdisp.c (syms_of_xdisp): Mention the active display table in doc
  string of glyphless-char-display.
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/display.texi       
display.texi-20091113204419-o5vbwnq5f7feedwu-6172
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-11-01 15:47:10 +0000
+++ b/doc/lispref/ChangeLog     2013-11-05 09:00:52 +0000
@@ -1,3 +1,7 @@
+2013-11-05  Xue Fuqiao  <address@hidden>
+
+       * display.texi (Glyphs): Add an index for glyph code.
+
 2013-11-01  Jan Djärv  <address@hidden>
 
        * display.texi (Face Attributes): Document :distant-foreground.

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2013-11-01 15:47:10 +0000
+++ b/doc/lispref/display.texi  2013-11-05 09:00:52 +0000
@@ -6112,6 +6112,7 @@
 @subsection Glyphs
 @cindex glyph
 
address@hidden glyph code
   A @dfn{glyph} is a graphical symbol which occupies a single
 character position on the screen.  Each glyph is represented in Lisp
 as a @dfn{glyph code}, which specifies a character and optionally a

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-05 07:51:55 +0000
+++ b/src/ChangeLog     2013-11-05 09:00:52 +0000
@@ -1,3 +1,8 @@
+2013-11-05  Xue Fuqiao  <address@hidden>
+
+       * xdisp.c (syms_of_xdisp): Mention the active display table in doc
+       string of glyphless-char-display.
+
 2013-11-05  Jan Djärv  <address@hidden>
 
        * nsfns.m (ns_get_name_from_ioreg): New function.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-11-04 17:30:33 +0000
+++ b/src/xdisp.c       2013-11-05 09:00:52 +0000
@@ -29723,7 +29723,11 @@
 The char-table has one extra slot to control the display of a character for
 which no font is found.  This slot only takes effect on graphical terminals.
 Its value should be an ASCII acronym string, `hex-code', `empty-box', or
-`thin-space'.  The default is `empty-box'.  */);
+`thin-space'.  The default is `empty-box'.
+
+If a character has a non-nil entry in an active display table, the
+display table takes effect; in this case, Emacs does not consult
+`glyphless-char-display' at all.  */);
   Vglyphless_char_display = Fmake_char_table (Qglyphless_char_display, Qnil);
   Fset_char_table_extra_slot (Vglyphless_char_display, make_number (0),
                              Qempty_box);