diff options
| author | Kenichi Handa <handa@m17n.org> | 2009-04-29 01:42:13 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2009-04-29 01:42:13 +0000 |
| commit | 24b345504c6b73305ce59bf90bff95b358542c2c (patch) | |
| tree | 819a0ed934805a93102b93eb61a7e0026e37c9b7 | |
| parent | 518c4881875ff7493ce8ff336ef15c1dc7994618 (diff) | |
| download | emacs-24b345504c6b73305ce59bf90bff95b358542c2c.tar.gz | |
(set_default_ascii_font): Delete this unused function.
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/fontset.c | 17 |
2 files changed, 10 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5a8df8f5408..d47f354ba6a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2009-04-29 Kenichi Handa <handa@m17n.org> + + * fontset.h (set_default_ascii_font): Delete extern. + + * fontset.c (set_default_ascii_font): Delete this unused function. + + * frame.c (x_set_font): When ARG is a font-object, check if the + font-object matches with the ASCII font-spec of the frame's + fontset. If not, create a new fontset for the frame. + 2009-04-28 Andreas Schwab <schwab@linux-m68k.org> * fns.c (Flocale_info): Protect vector from GC during decoding. diff --git a/src/fontset.c b/src/fontset.c index 6e2e34dac77..3eb835401f2 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -765,23 +765,6 @@ make_fontset (frame, name, base) return fontset; } - -/* Set the ASCII font of the default fontset to FONTNAME if that is - not yet set. */ -void -set_default_ascii_font (fontname) - Lisp_Object fontname; -{ - if (! STRINGP (FONTSET_ASCII (Vdefault_fontset))) - { - int id = fs_query_fontset (fontname, 2); - - if (id >= 0) - fontname = FONTSET_ASCII (FONTSET_FROM_ID (id)); - FONTSET_ASCII (Vdefault_fontset)= fontname; - } -} - /********** INTERFACES TO xfaces.c, xfns.c, and dispextern.h **********/ |