Mercurial > emacs

comparison src/ChangeLog @ 91450:afc545f3960e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conflict marker and merged entries about re-generating config.in.
author Glenn Morris <rgm@gnu.org>
date Sat, 02 Feb 2008 04:47:40 +0000
parents aefc429431cf
children 8f470b7fb439
comparison
equal deleted inserted replaced
91449:2122a7a1fdaa 91450:afc545f3960e
352 (struct face): Define members font_info and extra unconditionally. 352 (struct face): Define members font_info and extra unconditionally.
353 353
354 * ftfont.c (ftfont_open): Set members maybe_otf and otf of 354 * ftfont.c (ftfont_open): Set members maybe_otf and otf of
355 ftfont_info only when HAVE_LIBOTF is defined. 355 ftfont_info only when HAVE_LIBOTF is defined.
356 356
357 >>>>>>> 1.1.2.202
358 2008-02-01 Andreas Schwab <schwab@suse.de> 357 2008-02-01 Andreas Schwab <schwab@suse.de>
359 358
360 * xdisp.c (back_to_previous_visible_line_start): Fix type of beg 359 * xdisp.c (back_to_previous_visible_line_start): Fix type of beg
361 and end. 360 and end.
362 361
363 2008-02-01 Jason Rumney <jasonr@gnu.org> 362 2008-02-01 Jason Rumney <jasonr@gnu.org>
364 363
365 * w32font.c (w32font_driver): Add new fields. 364 * w32font.c (w32font_driver): Add new fields.
366 365
367 2008-02-01 Kenichi Handa <handa@ni.aist.go.jp> 366 2008-02-01 Kenichi Handa <handa@ni.aist.go.jp>
368
369 * config.in: Re-generated.
370 367
371 * Makefile.in (ALL_CFLAGS): Add @M17N_FLT_CFLAGS@. 368 * Makefile.in (ALL_CFLAGS): Add @M17N_FLT_CFLAGS@.
372 (FONTSRC, FONTOBJ) [HAVE_WINDOW_SYSTEM]: Set them unconditionally. 369 (FONTSRC, FONTOBJ) [HAVE_WINDOW_SYSTEM]: Set them unconditionally.
373 (LIBES): Add @M17N_FLT_CFLAGS@. 370 (LIBES): Add @M17N_FLT_CFLAGS@.
374 371
1919 enable_font_backend is nonzero, accept the composition method 1916 enable_font_backend is nonzero, accept the composition method
1920 COMPOSITION_WITH_GLYPH_STRING. 1917 COMPOSITION_WITH_GLYPH_STRING.
1921 1918
1922 * composite.h (enum composition_method) [USE_FONT_BACKEND]: New 1919 * composite.h (enum composition_method) [USE_FONT_BACKEND]: New
1923 enumeration COMPOSITION_WITH_GLYPH_STRING. 1920 enumeration COMPOSITION_WITH_GLYPH_STRING.
1924
1925 * config.in: Re-generated.
1926 1921
1927 * dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New 1922 * dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New
1928 members clip_x, clip_y, clip_width, and clip_height. 1923 members clip_x, clip_y, clip_width, and clip_height.
1929 (struct face) [USE_FONT_BACKEND]: New members font_info and extra. 1924 (struct face) [USE_FONT_BACKEND]: New members font_info and extra.
1930 1925