diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2008-06-26 11:57:58 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2008-06-26 11:57:58 +0000 |
| commit | c9fc02c727886c8ca8863365a395c91024455789 (patch) | |
| tree | 03d86eaec2864198dc8f5b6e8ded7ef997ebc695 | |
| parent | 1b5defe6580487f499c0af4a598ee968c5cae062 (diff) | |
| download | emacs-c9fc02c727886c8ca8863365a395c91024455789.tar.gz | |
* src/Makefile.in (SOME_MACHINE_OBJECTS): Remove w32bdf.o.
* lib-src/makefile.w32-in (obj): Remove w32bdf.o.
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 40 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
4 files changed, 28 insertions, 20 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index ce2eea2679e..991031daedd 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -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. diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 848f37eda8a..12d264df1a0 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -144,7 +144,7 @@ $(BLD)/ctags.$(O): ctags.c 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 \ diff --git a/src/ChangeLog b/src/ChangeLog index e4d5653d4a6..05873b192cf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. + * w32bdf.c, w32bdf.h: Remove obsolete files. - * makefile.w32-in: Remove refs to w32bdf.h and w32bdf.c. + * 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. + * 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.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. + * 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. + * 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. + * 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> diff --git a/src/Makefile.in b/src/Makefile.in index 8acfa014f2b..f359d619764 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -553,7 +553,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ 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) |