Mercurial > emacs

comparison src/xfaces.c @ 83164:e8df1878cfd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-427 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-428 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-429 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-430 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-431 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-432 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-433 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-434 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-435 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-436 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-204
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 03 Jul 2004 17:01:39 +0000
parents dbcd0af66869 075ad6932e06
children 4e92102a0172
comparison
equal deleted inserted replaced
83163:8e4ea1e2c254 83164:e8df1878cfd1
5849 merge_face_vectors (f, attrs, merged_attrs, 0); 5849 merge_face_vectors (f, attrs, merged_attrs, 0);
5850 5850
5851 face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0)); 5851 face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));
5852 5852
5853 if (! face) 5853 if (! face)
5854 signal_error ("cannot make face", 0); 5854 error ("cannot make face");
5855 5855
5856 /* If the font is the same, then not supported. */ 5856 /* If the font is the same, then not supported. */
5857 if (face->font == def_face->font) 5857 if (face->font == def_face->font)
5858 return 0; 5858 return 0;
5859 } 5859 }
5884 tty_supports_face_attributes_p (f, attrs, def_face) 5884 tty_supports_face_attributes_p (f, attrs, def_face)
5885 struct frame *f; 5885 struct frame *f;
5886 Lisp_Object *attrs; 5886 Lisp_Object *attrs;
5887 struct face *def_face; 5887 struct face *def_face;
5888 { 5888 {
5889 int weight, i; 5889 int weight;
5890 Lisp_Object val, fg, bg; 5890 Lisp_Object val, fg, bg;
5891 XColor fg_tty_color, fg_std_color; 5891 XColor fg_tty_color, fg_std_color;
5892 XColor bg_tty_color, bg_std_color; 5892 XColor bg_tty_color, bg_std_color;
5893 unsigned test_caps = 0; 5893 unsigned test_caps = 0;
5894 Lisp_Object *def_attrs = def_face->lface; 5894 Lisp_Object *def_attrs = def_face->lface;
6106 6106
6107 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); 6107 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
6108 if (def_face == NULL) 6108 if (def_face == NULL)
6109 { 6109 {
6110 if (! realize_basic_faces (f)) 6110 if (! realize_basic_faces (f))
6111 signal_error ("Cannot realize default face", 0); 6111 error ("Cannot realize default face");
6112 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); 6112 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
6113 } 6113 }
6114 6114
6115 /* Dispatch to the appropriate handler. */ 6115 /* Dispatch to the appropriate handler. */
6116 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) 6116 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))