*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 5447337a5701ea1f0254658cb0340a35f7dcc7d1..8c173e02c46a0afaa1fec06ca46f92df5dfc33f0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2004-01-06  Kim F. Storm  <storm@cua.dk>
+
+       * dispnew.c (buffer_posn_from_coords): Return both buffer/string
+       object and image object.  Return glyph width and height.
+       (mode_line_string, marginal_area_string): Ditto.
+
+       * dispextern.h (buffer_posn_from_coords, mode_line_string)
+       (marginal_area_string): Fix prototypes.
+
+       * keyboard.h (POSN_POSN, POSN_SET_POSN): Rename macros from
+       POSN_BUFFER_POSN and POSN_SET_BUFFER_POSN. All uses changed.
+       (POSN_INBUFFER_P, POSN_BUFFER_POSN): New macros.
+
+       * keyboard.c (make_lispy_position): Use modified mode_line_string,
+       buffer_posn_from_coords, and marginal_area_string functions to
+       include both string object and image object in the lispy position.
+       Also add actual glyph width and height to position.
+       (read_key_sequence): Use real buffer position from mouse
+       event to find keymap property even when click is in marginal area.
+
+       * xdisp.c (note_mode_line_or_margin_highlight): Use modified
+       mode_line_string and marginal_area_string functions to handle
+       both string object and image object properties.
+       
 2004-01-06  Andreas Schwab  <schwab@suse.de>
 
        * syntax.c (skip_chars): Treat '-' at end of string as ordinary