Mercurial > hg > xemacs-beta

diff src/glyphs.c @ 116:9f59509498e1 r20-1b10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b10
author cvs
date Mon, 13 Aug 2007 09:23:06 +0200
parents ac0620f6398e
children cca96a509cfe
line wrap: on
line diff
--- a/src/glyphs.c	Mon Aug 13 09:21:56 2007 +0200
+++ b/src/glyphs.c	Mon Aug 13 09:23:06 2007 +0200
@@ -54,6 +54,7 @@
 Lisp_Object Qmono_pixmap, Qcolor_pixmap, Qsubwindow;
 
 Lisp_Object Vcurrent_display_table;
+Lisp_Object Qdisplay_table;
 
 Lisp_Object Vtruncation_glyph, Vcontinuation_glyph, Voctal_escape_glyph;
 Lisp_Object Vcontrol_arrow_glyph, Vinvisible_text_glyph, Vhscroll_glyph;
@@ -386,6 +387,7 @@
 Lisp_Object
 make_string_from_file (Lisp_Object file)
 {
+  /* This function can call lisp */
   int count = specpdl_depth ();
   Lisp_Object temp_buffer;
   struct gcpro gcpro1;
@@ -2939,7 +2941,7 @@
 nil means display the character in the default fashion.
 Faces can have their own, overriding display table.
 */ );
-  Vcurrent_display_table = Fmake_specifier (Qgeneric);
+  Vcurrent_display_table = Fmake_specifier (Qdisplay_table);
   set_specifier_fallback (Vcurrent_display_table,
 			  list1 (Fcons (Qnil, Qnil)));
   set_specifier_caching (Vcurrent_display_table,