mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00
Code Issues Releases Activity

Remove conflict marker and merged entries about re-generating config.in.

Browse Source
This commit is contained in:
Glenn Morris 2008-02-02 04:47:40 +00:00
parent 7e14d90563
commit 849eb485c7
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -354,7 +354,6 @@
* ftfont.c (ftfont_open): Set members maybe_otf and otf of
ftfont_info only when HAVE_LIBOTF is defined.
>>>>>>> 1.1.2.202
2008-02-01 Andreas Schwab <schwab@suse.de>
* xdisp.c (back_to_previous_visible_line_start): Fix type of beg
@ -366,8 +365,6 @@
2008-02-01 Kenichi Handa <handa@ni.aist.go.jp>
* config.in: Re-generated.
* Makefile.in (ALL_CFLAGS): Add @M17N_FLT_CFLAGS@.
(FONTSRC, FONTOBJ) [HAVE_WINDOW_SYSTEM]: Set them unconditionally.
(LIBES): Add @M17N_FLT_CFLAGS@.
@ -1922,8 +1919,6 @@ third arg it->window.
* composite.h (enum composition_method) [USE_FONT_BACKEND]: New
enumeration COMPOSITION_WITH_GLYPH_STRING.
* config.in: Re-generated.
* dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New
members clip_x, clip_y, clip_width, and clip_height.
(struct face) [USE_FONT_BACKEND]: New members font_info and extra.