[Emacs-diffs] Changes to emacs/src/ChangeLog

[Stefan Monnier]

Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4232 emacs/src/ChangeLog:1.4233
*** emacs/src/ChangeLog:1.4232  Mon Feb 21 09:00:43 2005
--- emacs/src/ChangeLog Mon Feb 21 13:40:09 2005
***************
*** 1,3 ****
--- 1,7 ----
+ 2005-02-21  Stefan  <address@hidden>
+ 
+       * keymap.h: Declare Fcurrent_active_maps, used in doc.c.
+ 
  2005-02-21  Kim F. Storm  <address@hidden>
  
        * xdisp.c (move_it_vertically_backward): Eliminate two xasserts.
***************
*** 858,870 ****
        (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  <address@hidden>
  
--- 862,869 ----
***************
*** 974,985 ****
        (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
--- 973,979 ----
***************
*** 1031,1041 ****
  
  2004-12-27  Richard M. Stallman  <address@hidden>
  
- <<<<<<< 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
--- 1025,1031 ----