[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src frame.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] emacs/src frame.c |
Date: |
Thu, 19 Mar 2009 06:50:55 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 09/03/19 06:50:55
Modified files:
src : frame.c
Log message:
(x_set_font): Handle the case that ARG is a cons.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.411&r2=1.412
Patches:
Index: frame.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/frame.c,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -b -r1.411 -r1.412
--- frame.c 11 Mar 2009 07:53:37 -0000 1.411
+++ frame.c 19 Mar 2009 06:50:55 -0000 1.412
@@ -3372,8 +3372,9 @@
fail to use ARG as the new parameter value. */
store_frame_param (f, Qfont, oldval);
- /* ARG is a fontset name, a font name, or a font object.
- In the last case, this function never fail. */
+ /* ARG is a fontset name, a font name, a cons of fontset name and a
+ font object, or a font object. In the last case, this function
+ never fail. */
if (STRINGP (arg))
{
fontset = fs_query_fontset (arg, 0);
@@ -3396,6 +3397,17 @@
else
error ("The default fontset can't be used for a frame font");
}
+ else if (CONSP (arg) && STRINGP (XCAR (arg)) && FONT_OBJECT_P (XCDR (arg)))
+ {
+ /* This is the case that the ASCII font of F's fontset XCAR
+ (arg) is changed to the font XCDR (arg) by
+ `set-fontset-font'. */
+ fontset = fs_query_fontset (XCAR (arg), 0);
+ if (fontset < 0)
+ error ("Unknown fontset: %s", SDATA (XCAR (arg)));
+ font_object = XCDR (arg);
+ arg = AREF (font_object, FONT_NAME_INDEX);
+ }
else if (FONT_OBJECT_P (arg))
{
font_object = arg;