1 |
|
2005-02-21 Stefan <monnier@iro.umontreal.ca> |
2 |
|
|
3 |
|
* keymap.h: Declare Fcurrent_active_maps, used in doc.c. |
4 |
|
|
5 |
2005-02-21 Kim F. Storm <storm@cua.dk> |
2005-02-21 Kim F. Storm <storm@cua.dk> |
6 |
|
|
7 |
* xdisp.c (move_it_vertically_backward): Eliminate two xasserts. |
* xdisp.c (move_it_vertically_backward): Eliminate two xasserts. |
862 |
(install_window_handler) [TARGET_API_MAC_CARBON]: |
(install_window_handler) [TARGET_API_MAC_CARBON]: |
863 |
Register handlers for tracking/receiving drag-and-drop items. |
Register handlers for tracking/receiving drag-and-drop items. |
864 |
(do_ae_open_documents): Generate unibyte strings for filenames. |
(do_ae_open_documents): Generate unibyte strings for filenames. |
|
<<<<<<< ChangeLog |
|
|
(mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise. |
|
|
Reject only non-filename items. Set event modifiers and return value. |
|
|
======= |
|
865 |
(mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise. |
(mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise. |
866 |
Reject only non-filename items. Set event modifiers, and return value. |
Reject only non-filename items. Set event modifiers, and return value. |
|
>>>>>>> 1.4187 |
|
867 |
|
|
868 |
2004-12-28 Dan Nicolaescu <dann@ics.uci.edu> |
2004-12-28 Dan Nicolaescu <dann@ics.uci.edu> |
869 |
|
|
973 |
(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window |
(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window |
974 |
if the position is neither user-specified nor program-specified. |
if the position is neither user-specified nor program-specified. |
975 |
(x_free_frame_resources): Free size_hints. |
(x_free_frame_resources): Free size_hints. |
|
<<<<<<< ChangeLog |
|
|
(x_wm_set_size_hint): Allocate size_hints if needed. |
|
|
Set size_hints. |
|
|
======= |
|
976 |
(x_wm_set_size_hint): Allocate size_hints if needed. Set size_hints. |
(x_wm_set_size_hint): Allocate size_hints if needed. Set size_hints. |
|
>>>>>>> 1.4187 |
|
977 |
(mac_clear_font_name_table): New function. |
(mac_clear_font_name_table): New function. |
978 |
(mac_do_list_fonts): Initialize font_name_table if needed. |
(mac_do_list_fonts): Initialize font_name_table if needed. |
979 |
(x_list_fonts): Don't initialize font_name_table. Add BLOCK_INPUT |
(x_list_fonts): Don't initialize font_name_table. Add BLOCK_INPUT |
1025 |
|
|
1026 |
2004-12-27 Richard M. Stallman <rms@gnu.org> |
2004-12-27 Richard M. Stallman <rms@gnu.org> |
1027 |
|
|
|
<<<<<<< ChangeLog |
|
|
* buffer.c (Fbuffer_disable_undo): Delete (moved to simple.el). |
|
|
======= |
|
1028 |
* buffer.c (Fbuffer_disable_undo): Delete (move to simple.el). |
* buffer.c (Fbuffer_disable_undo): Delete (move to simple.el). |
|
>>>>>>> 1.4187 |
|
1029 |
(syms_of_buffer): Don't defsubr it. |
(syms_of_buffer): Don't defsubr it. |
1030 |
|
|
1031 |
* process.c (list_processes_1): Set undo_list instead |
* process.c (list_processes_1): Set undo_list instead |