1 files changed, 14 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c926e9b919..4cd7ef4f373 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+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.
+        I think those asserts are bogus if buffer contains invisible text
+        or images.
+
+2005-02-21  David Kastrup <dak@gnu.org>
+
+        * gtkutil.c (xg_create_frame_widgets): UNBLOCK_INPUT on error.
+
 2005-02-20  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (pos_visible_p): Be sure to move to the specified
@@ -848,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>
 
@@ -964,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
@@ -1021,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