diff options
| author | Jan D <jan.h.d@swipnet.se> | 2010-06-28 14:46:39 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2010-06-28 14:46:39 +0200 |
| commit | 5fc8e5bc7c83b653588ee7bae308f7b27d50536b (patch) | |
| tree | 59af43e8333898012227dcd64c19c86552b9b8d2 | |
| parent | 5224c41a7e0670423f04d74a8bd543d635f9516e (diff) | |
| download | emacs-5fc8e5bc7c83b653588ee7bae308f7b27d50536b.tar.gz | |
xfns.c (x_default_font_parameter): Remove got_from_system (Bug#6526).
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xfns.c | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0c8d584f139..f727dc73f1f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-06-28 Jan Djärv <jan.h.d@swipnet.se> + * 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. diff --git a/src/xfns.c b/src/xfns.c index 516aaaffc93..ea592417d1f 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3067,13 +3067,12 @@ x_default_font_parameter (f, parms) 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 @@ x_default_font_parameter (f, parms) { char *name = xstrdup (system_font); font = font_open_by_name (f, name); - got_from_system = ! NILP (font); free (name); } } @@ -3127,10 +3125,8 @@ x_default_font_parameter (f, parms) 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); } |