comparison src/ChangeLog @ 108840:bace4ba4c137

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 31 May 2010 22:34:49 -0400
parents 481f67c74989 46728260f484
children 8e26c16cde27
comparison
equal deleted inserted replaced
108839:481f67c74989 108840:bace4ba4c137
1 2010-06-01 Stefan Monnier <monnier@iro.umontreal.ca> 1 2010-06-01 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * sysdep.c (child_setup_tty): Move the non-canonical initialization to 3 * sysdep.c (child_setup_tty): Move the non-canonical initialization to
4 the HAVE_TERMIO where it belongs (bug#6149). 4 the HAVE_TERMIO where it belongs (bug#6149).
5
6 2010-05-31 Stefan Monnier <monnier@iro.umontreal.ca>
7
8 * keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
9 of bug#6305).
5 10
6 2010-05-30 Eli Zaretskii <eliz@gnu.org> 11 2010-05-30 Eli Zaretskii <eliz@gnu.org>
7 12
8 * bidi.c (bidi_move_to_visually_next): Make sure the sentinel 13 * bidi.c (bidi_move_to_visually_next): Make sure the sentinel
9 state is always cached (bug#6306). 14 state is always cached (bug#6306).
120 Suggested by Masatake YAMATO <yamato@redhat.com>. 125 Suggested by Masatake YAMATO <yamato@redhat.com>.
121 126
122 2010-05-23 Eli Zaretskii <eliz@gnu.org> 127 2010-05-23 Eli Zaretskii <eliz@gnu.org>
123 128
124 * dispextern.h (init_iterator): Sync prototype with changed definition. 129 * dispextern.h (init_iterator): Sync prototype with changed definition.
130
131 2010-05-20 enami tsugutomo <tsugutomo.enami@jp.sony.com>
132
133 * s/netbsd.h: If terminfo is found, use it in preference to
134 termcap. (Bug#6190) [Backport from trunk]
125 135
126 2010-05-19 Eli Zaretskii <eliz@gnu.org> 136 2010-05-19 Eli Zaretskii <eliz@gnu.org>
127 137
128 Redesign and reimplement bidi-aware edge positions of glyph rows. 138 Redesign and reimplement bidi-aware edge positions of glyph rows.
129 139
2268 * gtkutil.c (xg_get_gdk_display): Remove (unused). 2278 * gtkutil.c (xg_get_gdk_display): Remove (unused).
2269 (xg_get_pixbuf_from_pix_and_mask, xg_create_frame_widgets) 2279 (xg_get_pixbuf_from_pix_and_mask, xg_create_frame_widgets)
2270 (xg_toggle_notify_cb, xg_set_toolkit_scroll_bar_thumb) 2280 (xg_toggle_notify_cb, xg_set_toolkit_scroll_bar_thumb)
2271 (xg_create_tool_bar): Remove unused variables. 2281 (xg_create_tool_bar): Remove unused variables.
2272 (x_wm_set_size_hint): Move declarations before statements. 2282 (x_wm_set_size_hint): Move declarations before statements.
2273 (xg_create_frame_widgets): Remove variable grav, 2283 (xg_create_frame_widgets): Remove variable grav.
2274 2284
2275 2010-02-21 Chong Yidong <cyd@stupidchicken.com> 2285 2010-02-21 Chong Yidong <cyd@stupidchicken.com>
2276 2286
2277 * m/arm.h: Define the LIB_GCC flag to be -lgcc_s (Bug#5518). 2287 * m/arm.h: Define the LIB_GCC flag to be -lgcc_s (Bug#5518).
2278 2288
2386 2396
2387 2010-01-28 Jan Djärv <jan.h.d@swipnet.se> 2397 2010-01-28 Jan Djärv <jan.h.d@swipnet.se>
2388 2398
2389 * xfns.c (Fx_create_frame): Remove window size matching code from 2399 * xfns.c (Fx_create_frame): Remove window size matching code from
2390 2010-01-15. 2400 2010-01-15.
2391 (x_get_current_desktop, x_get_desktop_workarea): Remove 2401 (x_get_current_desktop, x_get_desktop_workarea): Remove.
2392 2402
2393 2010-01-27 Jason Rumney <jasonr@gnu.org> 2403 2010-01-27 Jason Rumney <jasonr@gnu.org>
2394 2404
2395 * w32inevt.c (w32_kbd_patch_key): Save the unicode character. 2405 * w32inevt.c (w32_kbd_patch_key): Save the unicode character.
2396 (key_event): Use unicode for characters 128 and higher (Bug#4567). 2406 (key_event): Use unicode for characters 128 and higher (Bug#4567).
3223 font as parameter. 3233 font as parameter.
3224 (font_open_entity): Do not use cache, it does not pick up new 3234 (font_open_entity): Do not use cache, it does not pick up new
3225 fontconfig settings like hinting. 3235 fontconfig settings like hinting.
3226 (font_load_for_lface): If spec had a name in it, store it in entity. 3236 (font_load_for_lface): If spec had a name in it, store it in entity.
3227 3237
3228 * emacs.c (main): Call syms_of_xsettings 3238 * emacs.c (main): Call syms_of_xsettings.
3229 3239
3230 * config.in: HAVE_GCONF is new. 3240 * config.in: HAVE_GCONF is new.
3231 3241
3232 * Makefile.in (GCONF_CFLAGS, GCONF_LIBS): New variables for HAVE_GCONF. 3242 * Makefile.in (GCONF_CFLAGS, GCONF_LIBS): New variables for HAVE_GCONF.
3233 xsettings.o is new. 3243 xsettings.o is new.
8808 (fill_gstring_body, autocmp_chars, composition_compute_stop_pos) 8818 (fill_gstring_body, autocmp_chars, composition_compute_stop_pos)
8809 (composition_reseat_it, composition_update_it) 8819 (composition_reseat_it, composition_update_it)
8810 (composition_adjust_point, Fcomposition_get_gstring): New functions. 8820 (composition_adjust_point, Fcomposition_get_gstring): New functions.
8811 (syms_of_composite): Initialize gstring_hash_table, gstrint_work, 8821 (syms_of_composite): Initialize gstring_hash_table, gstrint_work,
8812 and gstring_work_headers. DEFVAR_LISP composition-function-table. 8822 and gstring_work_headers. DEFVAR_LISP composition-function-table.
8813 Defsubr compostion_get_gstring. 8823 Defsubr composition_get_gstring.
8814 8824
8815 * dispextern.h (struct glyph): New union u.cmp. Delete the member 8825 * dispextern.h (struct glyph): New union u.cmp. Delete the member
8816 cmp_id. 8826 cmp_id.
8817 (struct glyph_string): Delete the member gidx. New members 8827 (struct glyph_string): Delete the member gidx. New members
8818 cmp_id, cmp_from, and cmp_to. 8828 cmp_id, cmp_from, and cmp_to.