[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfaces.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfaces.c |
Date: |
Mon, 22 Nov 2004 18:40:41 -0500 |
Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.306 emacs/src/xfaces.c:1.307
*** emacs/src/xfaces.c:1.306 Sun Nov 7 03:47:09 2004
--- emacs/src/xfaces.c Mon Nov 22 23:25:49 2004
***************
*** 3009,3015 ****
{
/* This is of limited utility since it works with character
widths. Keep it for compatibility. --gerd. */
! int face_id = lookup_named_face (f, face, 0);
struct face *face = (face_id < 0
? NULL
: FACE_FROM_ID (f, face_id));
--- 3009,3015 ----
{
/* This is of limited utility since it works with character
widths. Keep it for compatibility. --gerd. */
! int face_id = lookup_named_face (f, face, 0, 0);
struct face *face = (face_id < 0
? NULL
: FACE_FROM_ID (f, face_id));
***************
*** 4923,4929 ****
else
{
struct frame *f = frame_or_selected_frame (frame, 1);
! int face_id = lookup_named_face (f, face, 0);
struct face *face = FACE_FROM_ID (f, face_id);
return face ? build_string (face->font_name) : Qnil;
}
--- 4923,4929 ----
else
{
struct frame *f = frame_or_selected_frame (frame, 1);
! int face_id = lookup_named_face (f, face, 0, 1);
struct face *face = FACE_FROM_ID (f, face_id);
return face ? build_string (face->font_name) : Qnil;
}
***************
*** 5615,5624 ****
isn't realized and cannot be realized. */
int
! lookup_named_face (f, symbol, c)
struct frame *f;
Lisp_Object symbol;
int c;
{
Lisp_Object attrs[LFACE_VECTOR_SIZE];
Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE];
--- 5615,5625 ----
isn't realized and cannot be realized. */
int
! lookup_named_face (f, symbol, c, signal_p)
struct frame *f;
Lisp_Object symbol;
int c;
+ int signal_p;
{
Lisp_Object attrs[LFACE_VECTOR_SIZE];
Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE];
***************
*** 5631,5637 ****
default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
}
! get_lface_attributes (f, symbol, symbol_attrs, 1);
bcopy (default_face->lface, attrs, sizeof attrs);
merge_face_vectors (f, symbol_attrs, attrs, 0);
--- 5632,5640 ----
default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
}
! if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p))
! return -1;
!
bcopy (default_face->lface, attrs, sizeof attrs);
merge_face_vectors (f, symbol_attrs, attrs, 0);
***************
*** 5652,5658 ****
if (lface_id >= 0 && lface_id < lface_id_to_name_size)
{
Lisp_Object face_name = lface_id_to_name[lface_id];
! face_id = lookup_named_face (f, face_name, 0);
}
else
face_id = -1;
--- 5655,5661 ----
if (lface_id >= 0 && lface_id < lface_id_to_name_size)
{
Lisp_Object face_name = lface_id_to_name[lface_id];
! face_id = lookup_named_face (f, face_name, 0, 1);
}
else
face_id = -1;