*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68c6248c6fb296522f93f7bb67816a4f54422fb0..a41eadc355b9d0c9b57be68c85541d4d4ce434b0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/src/ChangeLog b/src/ChangeLog
index ecd4f3661eccb4a756c198cdea041bc88d702fe6..4cd7ef4f373789d83dd7b4be52452e2c511122da 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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