[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfaces.c [emacs-unicode-2]
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfaces.c [emacs-unicode-2] |
Date: |
Wed, 30 Jun 2004 00:33:04 -0400 |
Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.281.2.10 emacs/src/xfaces.c:1.281.2.11
*** emacs/src/xfaces.c:1.281.2.10 Mon Jun 28 07:29:25 2004
--- emacs/src/xfaces.c Wed Jun 30 04:12:09 2004
***************
*** 4997,5010 ****
if (! face)
return Qnil;
! if (NILP (character))
! return build_string (face->font_name);
! CHECK_CHARACTER (character);
! face_id = FACE_FOR_CHAR (f, face, XINT (character), -1, Qnil);
! face = FACE_FROM_ID (f, face_id);
! return (face->font && face->font_name
! ? build_string (face->font_name)
! : Qnil);
}
}
--- 4997,5014 ----
if (! face)
return Qnil;
! #ifdef HAVE_WINDOW_SYSTEM
! if (!NILP (character))
! {
! CHECK_CHARACTER (character);
! face_id = FACE_FOR_CHAR (f, face, XINT (character), -1, Qnil);
! face = FACE_FROM_ID (f, face_id);
! return (face->font && face->font_name
! ? build_string (face->font_name)
! : Qnil);
! }
! #endif
! return build_string (face->font_name);
}
}