From: Stefan Monnier Date: Mon, 21 Feb 2005 13:44:11 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: ttn-vms-21-2-B4~2170 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9df747e1c99d8dbb21e46a5d4aa47c89d433d6cf;p=emacs.git *** empty log message *** --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 68c6248c6fb..a41eadc355b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2005-02-21 Stefan + * 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 diff --git a/src/ChangeLog b/src/ChangeLog index ecd4f3661ec..4cd7ef4f373 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-02-21 Stefan + + * keymap.h: Declare Fcurrent_active_maps, used in doc.c. + 2005-02-21 Kim F. Storm * 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 @@ -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 -<<<<<<< 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