Mercurial > emacs
changeset 60194:a8f01b89d2ce
*** empty log message ***
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 21 Feb 2005 13:44:11 +0000 |
| parents | 261ebd199f28 |
| children | 3e86eb0e2e0b |
| files | lisp/ChangeLog src/ChangeLog |
| diffstat | 2 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Feb 21 13:43:53 2005 +0000 +++ b/lisp/ChangeLog Mon Feb 21 13:44:11 2005 +0000 @@ -1,5 +1,7 @@ 2005-02-21 Stefan <monnier@iro.umontreal.ca> + * frame.el (blink-cursor-mode): Use define-minor-mode. + * term/mac-win.el (function-key-map): Use char-names more consistently. (file-name-coding-system): Only set it for MacOS-9. The other case is already handled in mule-cmds.el (where it also works when mac-win.el
--- a/src/ChangeLog Mon Feb 21 13:43:53 2005 +0000 +++ b/src/ChangeLog Mon Feb 21 13:44:11 2005 +0000 @@ -1,3 +1,7 @@ +2005-02-21 Stefan <monnier@iro.umontreal.ca> + + * keymap.h: Declare Fcurrent_active_maps, used in doc.c. + 2005-02-21 Kim F. Storm <storm@cua.dk> * xdisp.c (move_it_vertically_backward): Eliminate two xasserts. @@ -858,13 +862,8 @@ (install_window_handler) [TARGET_API_MAC_CARBON]: Register handlers for tracking/receiving drag-and-drop items. (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. -======= (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise. Reject only non-filename items. Set event modifiers, and return value. ->>>>>>> 1.4187 2004-12-28 Dan Nicolaescu <dann@ics.uci.edu> @@ -974,12 +973,7 @@ (x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window if the position is neither user-specified nor program-specified. (x_free_frame_resources): Free size_hints. -<<<<<<< ChangeLog - (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 (mac_clear_font_name_table): New function. (mac_do_list_fonts): Initialize font_name_table if needed. (x_list_fonts): Don't initialize font_name_table. Add BLOCK_INPUT @@ -1031,11 +1025,7 @@ 2004-12-27 Richard M. Stallman <rms@gnu.org> -<<<<<<< ChangeLog - * buffer.c (Fbuffer_disable_undo): Delete (moved to simple.el). -======= * buffer.c (Fbuffer_disable_undo): Delete (move to simple.el). ->>>>>>> 1.4187 (syms_of_buffer): Don't defsubr it. * process.c (list_processes_1): Set undo_list instead