aboutsummaryrefslogtreecommitdiffstats
path: root/src/frame.c
diff options
context:
space:
mode:
authorKaroly Lorentey <[email protected]>2005-03-16 16:06:15 +0000
committerKaroly Lorentey <[email protected]>2005-03-16 16:06:15 +0000
commit14c0ac78c48e6bdf832e370ef15ecbef6573dd06 (patch)
treeae0aa5371351ec1a2d0bdf7c55e60b8df4b0063c /src/frame.c
parent38d2de214077b4e600d9f9d20d7ec81e1f1c8908 (diff)
parenta7679889e8213289331577d1d9e6d1187a20d035 (diff)
Merged from [email protected] (patch 37-38, 162-182)
Patches applied: * [email protected]/emacs--cvs-trunk--0--patch-162 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-163 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-164 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-165 Merge from gnus--rel--5.10 * [email protected]/emacs--cvs-trunk--0--patch-166 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-167 Tweak obsolete function/variable warning message * [email protected]/emacs--cvs-trunk--0--patch-168 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-169 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-170 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-171 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-172 Merge from gnus--rel--5.10 * [email protected]/emacs--cvs-trunk--0--patch-173 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-174 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-175 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-176 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-177 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-178 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-179 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-180 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-181 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-182 Update from CVS * [email protected]/gnus--rel--5.10--patch-37 Update from CVS * [email protected]/gnus--rel--5.10--patch-38 Update from CVS git-archimport-id: [email protected]/emacs--multi-tty--0--patch-309
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c
index 06ffc04f2d..375b1a20a9 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3321,6 +3321,7 @@ x_set_font (f, arg, oldval)
error ("The characters of the given font have varying widths");
else if (STRINGP (result))
{
+ set_default_ascii_font (result);
if (STRINGP (fontset_name))
{
/* Fontset names are built from ASCII font names, so the