Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
115:f109f7dabbe2 116:9f59509498e1
52 52
53 /* Qtext, Qpointer defined in general.c */ 53 /* Qtext, Qpointer defined in general.c */
54 Lisp_Object Qmono_pixmap, Qcolor_pixmap, Qsubwindow; 54 Lisp_Object Qmono_pixmap, Qcolor_pixmap, Qsubwindow;
55 55
56 Lisp_Object Vcurrent_display_table; 56 Lisp_Object Vcurrent_display_table;
57 Lisp_Object Qdisplay_table;
57 58
58 Lisp_Object Vtruncation_glyph, Vcontinuation_glyph, Voctal_escape_glyph; 59 Lisp_Object Vtruncation_glyph, Vcontinuation_glyph, Voctal_escape_glyph;
59 Lisp_Object Vcontrol_arrow_glyph, Vinvisible_text_glyph, Vhscroll_glyph; 60 Lisp_Object Vcontrol_arrow_glyph, Vinvisible_text_glyph, Vhscroll_glyph;
60 Lisp_Object Vxemacs_logo; 61 Lisp_Object Vxemacs_logo;
61 62
384 /* utility function useful in retrieving data from a file. */ 385 /* utility function useful in retrieving data from a file. */
385 386
386 Lisp_Object 387 Lisp_Object
387 make_string_from_file (Lisp_Object file) 388 make_string_from_file (Lisp_Object file)
388 { 389 {
390 /* This function can call lisp */
389 int count = specpdl_depth (); 391 int count = specpdl_depth ();
390 Lisp_Object temp_buffer; 392 Lisp_Object temp_buffer;
391 struct gcpro gcpro1; 393 struct gcpro gcpro1;
392 Lisp_Object data; 394 Lisp_Object data;
393 395
2937 Each value should be a string, a glyph, a vector or nil. 2939 Each value should be a string, a glyph, a vector or nil.
2938 If a value is a vector it must be composed only of strings and glyphs. 2940 If a value is a vector it must be composed only of strings and glyphs.
2939 nil means display the character in the default fashion. 2941 nil means display the character in the default fashion.
2940 Faces can have their own, overriding display table. 2942 Faces can have their own, overriding display table.
2941 */ ); 2943 */ );
2942 Vcurrent_display_table = Fmake_specifier (Qgeneric); 2944 Vcurrent_display_table = Fmake_specifier (Qdisplay_table);
2943 set_specifier_fallback (Vcurrent_display_table, 2945 set_specifier_fallback (Vcurrent_display_table,
2944 list1 (Fcons (Qnil, Qnil))); 2946 list1 (Fcons (Qnil, Qnil)));
2945 set_specifier_caching (Vcurrent_display_table, 2947 set_specifier_caching (Vcurrent_display_table,
2946 slot_offset (struct window, 2948 slot_offset (struct window,
2947 display_table), 2949 display_table),