Mercurial > emacs
changeset 96328:6692bd7023d6
* src/Makefile.in (SOME_MACHINE_OBJECTS): Remove w32bdf.o.
* lib-src/makefile.w32-in (obj): Remove w32bdf.o.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 26 Jun 2008 11:57:58 +0000 |
| parents | 2fc5aff56d81 |
| children | 987e540891e7 |
| files | lib-src/ChangeLog lib-src/makefile.w32-in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 34 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Thu Jun 26 10:48:28 2008 +0000 +++ b/lib-src/ChangeLog Thu Jun 26 11:57:58 2008 +0000 @@ -1,3 +1,7 @@ +2008-06-26 Juanma Barranquero <lekktu@gmail.com> + + * makefile.w32-in (obj): Remove w32bdf.o. + 2008-06-26 Dan Nicolaescu <dann@ics.uci.edu> * fakemail.c: Remove references to obsolete variables.
--- a/lib-src/makefile.w32-in Thu Jun 26 10:48:28 2008 +0000 +++ b/lib-src/makefile.w32-in Thu Jun 26 11:57:58 2008 +0000 @@ -144,7 +144,7 @@ obj = dosfns.o msdos.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ - w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ + w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ font.o w32font.o \ dispnew.o frame.o scroll.o xdisp.o window.o \
--- a/src/ChangeLog Thu Jun 26 10:48:28 2008 +0000 +++ b/src/ChangeLog Thu Jun 26 11:57:58 2008 +0000 @@ -1,28 +1,32 @@ +2008-06-26 Juanma Barranquero <lekktu@gmail.com> + + * Makefile.in (SOME_MACHINE_OBJECTS): Remove w32bdf.o. + 2008-06-26 Jason Rumney <jasonr@gnu.org> - * w32bdf.c, w32bdf.h: Remove obsolete files. - - * makefile.w32-in: Remove refs to w32bdf.h and w32bdf.c. - - * w32gui.h: Don't include w32bdf.h. - (XCharStruct, enum w32_char_font_type, W32FontStruct): - Remove obsolete font support. - - * w32font.h (struct w32font_info): Remove compat_w32_font. - Add hfont member. - (FONT_COMPAT): Remove obsolete macro. - - * w32font.c (w32font_close): Remove compat code. Delete hfont member. - (w32font_encode_char, w32font_text_extents): Use new hfont member. - (w32font_open_internal): Remove compat code. Set new hfont member. - (Fx_select_font): Use new hfont member. - - * w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape): - (uniscribe_encode_char): Use new hfont member. - - * w32term.c (x_draw_glyph_string_foreground): - (x_draw_composite_glyph_string_foreground): Use new hfont member. - (x_draw_glyph_string): Use metrics in w32font_info. + * w32bdf.c, w32bdf.h: Remove obsolete files. + + * makefile.w32-in: Remove refs to w32bdf.h and w32bdf.c. + + * w32gui.h: Don't include w32bdf.h. + (XCharStruct, enum w32_char_font_type, W32FontStruct): + Remove obsolete font support. + + * w32font.h (struct w32font_info): Remove compat_w32_font. + Add hfont member. + (FONT_COMPAT): Remove obsolete macro. + + * w32font.c (w32font_close): Remove compat code. Delete hfont member. + (w32font_encode_char, w32font_text_extents): Use new hfont member. + (w32font_open_internal): Remove compat code. Set new hfont member. + (Fx_select_font): Use new hfont member. + + * w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape): + (uniscribe_encode_char): Use new hfont member. + + * w32term.c (x_draw_glyph_string_foreground): + (x_draw_composite_glyph_string_foreground): Use new hfont member. + (x_draw_glyph_string): Use metrics in w32font_info. 2008-06-26 Kenichi Handa <handa@m17n.org> @@ -105,7 +109,7 @@ 2008-06-25 Jason Rumney <jasonr@gnu.org> - * xdisp.c (get_glyph_face_and_encoding): Encode invalid glyphs as 0. + * xdisp.c (get_glyph_face_and_encoding): Encode invalid glyphs as 0. 2008-06-25 Stefan Monnier <monnier@iro.umontreal.ca>
--- a/src/Makefile.in Thu Jun 26 10:48:28 2008 +0000 +++ b/src/Makefile.in Thu Jun 26 11:57:58 2008 +0000 @@ -553,7 +553,7 @@ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ - w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ + w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)