[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c,v |
Date: |
Fri, 20 Jun 2008 01:53:35 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/06/20 01:53:33
Index: xfns.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfns.c,v
retrieving revision 1.716
retrieving revision 1.717
diff -u -b -r1.716 -r1.717
--- xfns.c 19 Jun 2008 01:57:19 -0000 1.716
+++ xfns.c 20 Jun 2008 01:53:32 -0000 1.717
@@ -3060,8 +3060,13 @@
Lisp_Object parms;
{
struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
- Lisp_Object font = x_get_arg (dpyinfo, parms, Qfont, "font", "Font",
+ Lisp_Object font_param = x_get_arg (dpyinfo, parms, Qfont, NULL, NULL,
RES_TYPE_STRING);
+ Lisp_Object font;
+ if (EQ (font_param, Qunbound))
+ font_param = Qnil;
+ font = !NILP (font_param) ? font_param
+ : x_get_arg (dpyinfo, parms, Qfont, "font", "Font", RES_TYPE_STRING);
if (! STRINGP (font))
{
@@ -3088,11 +3093,11 @@
if (NILP (font))
error ("No suitable font was found");
}
- else
+ else if (!NILP (font_param))
{
/* Remember the explicit font parameter, so we can re-apply it after
we've applied the `default' face settings. */
- x_set_frame_parameters (f, Fcons (Fcons (Qfont_param, font), Qnil));
+ x_set_frame_parameters (f, Fcons (Fcons (Qfont_param, font_param),
Qnil));
}
x_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING);
}
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Chong Yidong, 2008/06/10
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Chong Yidong, 2008/06/12
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Kenichi Handa, 2008/06/13
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Stefan Monnier, 2008/06/15
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Chong Yidong, 2008/06/15
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Stefan Monnier, 2008/06/18
- [Emacs-diffs] Changes to emacs/src/xfns.c,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Kenichi Handa, 2008/06/19
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Chong Yidong, 2008/06/25
- [Emacs-diffs] Changes to emacs/src/xfns.c,v, Chong Yidong, 2008/06/25