aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2005-03-08 08:46:48 +0000
committerKenichi Handa2005-03-08 08:46:48 +0000
commitee5d57b04325be3c36049faebb452a5527bcea4e (patch)
tree708d1cc3ad5780ad77e1523c854be2f51e628d7e /src
parent8f2e6673597e952fc92191f21fe554a5f51242dc (diff)
downloademacs-ee5d57b04325be3c36049faebb452a5527bcea4e.tar.gz
emacs-ee5d57b04325be3c36049faebb452a5527bcea4e.zip
(x_set_font): Call set_default_ascii_font if an
available font is found.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog11
-rw-r--r--src/frame.c1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 854a8673458..d9a2d3ec3f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
12005-03-08 Kenichi Handa <handa@m17n.org>
2
3 * frame.c (x_set_font): Call set_default_ascii_font if an
4 available font is found.
5
6 * fontset.c (set_default_ascii_font): New function.
7 (syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset)
8 here.
9
10 * fontset.h (set_default_ascii_font): Extern it.
11
12005-03-07 Kim F. Storm <storm@cua.dk> 122005-03-07 Kim F. Storm <storm@cua.dk>
2 13
3 * xdisp.c (CLEAR_IMAGE_CACHE_COUNT): New const. 14 * 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)
3084 error ("The characters of the given font have varying widths"); 3084 error ("The characters of the given font have varying widths");
3085 else if (STRINGP (result)) 3085 else if (STRINGP (result))
3086 { 3086 {
3087 set_default_ascii_font (result);
3087 if (STRINGP (fontset_name)) 3088 if (STRINGP (fontset_name))
3088 { 3089 {
3089 /* Fontset names are built from ASCII font names, so the 3090 /* Fontset names are built from ASCII font names, so the