From: Kenichi Handa <handa@m17n.org>
Date: Tue, 8 Mar 2005 08:46:48 +0000 (+0000)
Subject: (x_set_font): Call set_default_ascii_font if an
X-Git-Tag: ttn-vms-21-2-B4~1882
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee5d57b04325be3c36049faebb452a5527bcea4e;p=emacs.git

(x_set_font): Call set_default_ascii_font if an
available font is found.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 854a8673458..d9a2d3ec3f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2005-03-08  Kenichi Handa  <handa@m17n.org>
+
+	* frame.c (x_set_font): Call set_default_ascii_font if an
+	available font is found.
+
+	* fontset.c (set_default_ascii_font): New function.
+	(syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset)
+	here.
+
+	* fontset.h (set_default_ascii_font): Extern it.
+
 2005-03-07  Kim F. Storm  <storm@cua.dk>
 
 	* xdisp.c (CLEAR_IMAGE_CACHE_COUNT): New const.
diff --git a/src/frame.c b/src/frame.c
index 36014df23c1..2dc8e633a3f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3084,6 +3084,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