diff options
| author | Kenichi Handa | 2009-04-29 01:42:13 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2009-04-29 01:42:13 +0000 |
| commit | 24b345504c6b73305ce59bf90bff95b358542c2c (patch) | |
| tree | 819a0ed934805a93102b93eb61a7e0026e37c9b7 /src | |
| parent | 518c4881875ff7493ce8ff336ef15c1dc7994618 (diff) | |
| download | emacs-24b345504c6b73305ce59bf90bff95b358542c2c.tar.gz emacs-24b345504c6b73305ce59bf90bff95b358542c2c.zip | |
(set_default_ascii_font): Delete this unused function.
Diffstat (limited to 'src')
| -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 @@ | |||
| 1 | 2009-04-29 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * fontset.h (set_default_ascii_font): Delete extern. | ||
| 4 | |||
| 5 | * fontset.c (set_default_ascii_font): Delete this unused function. | ||
| 6 | |||
| 7 | * frame.c (x_set_font): When ARG is a font-object, check if the | ||
| 8 | font-object matches with the ASCII font-spec of the frame's | ||
| 9 | fontset. If not, create a new fontset for the frame. | ||
| 10 | |||
| 1 | 2009-04-28 Andreas Schwab <schwab@linux-m68k.org> | 11 | 2009-04-28 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 12 | ||
| 3 | * fns.c (Flocale_info): Protect vector from GC during decoding. | 13 | * 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) | |||
| 765 | return fontset; | 765 | return fontset; |
| 766 | } | 766 | } |
| 767 | 767 | ||
| 768 | |||
| 769 | /* Set the ASCII font of the default fontset to FONTNAME if that is | ||
| 770 | not yet set. */ | ||
| 771 | void | ||
| 772 | set_default_ascii_font (fontname) | ||
| 773 | Lisp_Object fontname; | ||
| 774 | { | ||
| 775 | if (! STRINGP (FONTSET_ASCII (Vdefault_fontset))) | ||
| 776 | { | ||
| 777 | int id = fs_query_fontset (fontname, 2); | ||
| 778 | |||
| 779 | if (id >= 0) | ||
| 780 | fontname = FONTSET_ASCII (FONTSET_FROM_ID (id)); | ||
| 781 | FONTSET_ASCII (Vdefault_fontset)= fontname; | ||
| 782 | } | ||
| 783 | } | ||
| 784 | |||
| 785 | 768 | ||
| 786 | /********** INTERFACES TO xfaces.c, xfns.c, and dispextern.h **********/ | 769 | /********** INTERFACES TO xfaces.c, xfns.c, and dispextern.h **********/ |
| 787 | 770 | ||