Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
5fc8e5bc
Commit
5fc8e5bc
authored
Jun 28, 2010
by
Jan D
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xfns.c (x_default_font_parameter): Remove got_from_system (Bug#6526).
parent
5224c41a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
src/ChangeLog
src/ChangeLog
+3
-0
src/xfns.c
src/xfns.c
+3
-7
No files found.
src/ChangeLog
View file @
5fc8e5bc
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.
...
...
src/xfns.c
View file @
5fc8e5bc
...
...
@@ -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 take
s
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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment