[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100658: xfns.c (x_default_font_param
From: |
Jan D |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100658: xfns.c (x_default_font_parameter): Remove got_from_system (Bug#6526). |
Date: |
Mon, 28 Jun 2010 14:46:39 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100658
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Mon 2010-06-28 14:46:39 +0200
message:
xfns.c (x_default_font_parameter): Remove got_from_system (Bug#6526).
modified:
src/ChangeLog
src/xfns.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-06-28 10:11:26 +0000
+++ b/src/ChangeLog 2010-06-28 12:46:39 +0000
@@ -1,5 +1,8 @@
2010-06-28 Jan Djärv <address@hidden>
+ * xfns.c (x_default_font_parameter): Remove got_from_system
+ (Bug#6526).
+
* xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
(gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
defines based on what configure finds.
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2010-06-27 00:30:52 +0000
+++ b/src/xfns.c 2010-06-28 12:46:39 +0000
@@ -3067,13 +3067,12 @@
Lisp_Object font_param = x_get_arg (dpyinfo, parms, Qfont, NULL, NULL,
RES_TYPE_STRING);
Lisp_Object font = Qnil;
- int got_from_system = 0;
if (EQ (font_param, Qunbound))
font_param = Qnil;
if (NILP (font_param))
{
- /* System font takes precedendce over X resources. We must suggest this
+ /* System font should take precedendce over X resources. We suggest this
regardless of font-use-system-font because .emacs may not have been
read yet. */
const char *system_font = xsettings_get_system_font ();
@@ -3081,7 +3080,6 @@
{
char *name = xstrdup (system_font);
font = font_open_by_name (f, name);
- got_from_system = ! NILP (font);
free (name);
}
}
@@ -3127,10 +3125,8 @@
x_set_frame_parameters (f, Fcons (Fcons (Qfont_param, font_param),
Qnil));
}
- x_default_parameter (f, parms, Qfont, font,
- got_from_system ? NULL : "font",
- got_from_system ? NULL : "Font",
- RES_TYPE_STRING);
+ /* This call will make X resources override any system font setting. */
+ x_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100658: xfns.c (x_default_font_parameter): Remove got_from_system (Bug#6526).,
Jan D <=