[emacs] (malloc, free): Define as xmalloc, and xfree.

[bpt/emacs.git] / src / w32term.c

diff --git a/src/w32term.c b/src/w32term.c
index 27a4933..6db366c 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1350,7 +1350,8 @@ note_mouse_highlight (f, x, y)
   if (WINDOWP (window) && portion == 0 && row >= 0 && column >= 0
       && row < FRAME_HEIGHT (f) && column < FRAME_WIDTH (f)
       && EQ (w->window_end_valid, w->buffer)
-      && w->last_modified == BUF_MODIFF (XBUFFER (w->buffer)))
+      && w->last_modified == BUF_MODIFF (XBUFFER (w->buffer))
+      && w->last_overlay_modified == BUF_OVERLAY_MODIFF (XBUFFER (w->buffer)))
     {
       int *ptr = FRAME_CURRENT_GLYPHS (f)->charstarts[row];
       int i, pos;
@@ -1508,7 +1509,7 @@ fast_find_position (window, pos, columnp, rowp)
   FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
   int i;
   int row = 0;
-  int left = w->left;
+  int left = WINDOW_LEFT_MARGIN (w);
   int top = w->top;
   int height = XFASTINT (w->height) - ! MINI_WINDOW_P (w);
   int width = window_internal_width (w);
@@ -1593,10 +1594,10 @@ show_mouse_face (dpyinfo, hl)
     {
       int column = (i == FRAME_WIN32_DISPLAY_INFO (f)->mouse_face_beg_row
                    ? FRAME_WIN32_DISPLAY_INFO (f)->mouse_face_beg_col
-                   : w->left);
+                   : WINDOW_LEFT_MARGIN (w));
       int endcolumn = (i == FRAME_WIN32_DISPLAY_INFO (f)->mouse_face_end_row
                       ? FRAME_WIN32_DISPLAY_INFO (f)->mouse_face_end_col
-                      : w->left + width);
+                      : WINDOW_LEFT_MARGIN (w) + width);
       endcolumn = min (endcolumn, FRAME_CURRENT_GLYPHS (f)->used[i]);
 
       /* If the cursor's in the text we are about to rewrite,
@@ -2346,7 +2347,6 @@ is_dead_key (int wparam)
    We return the number of characters stored into the buffer,
    thus pretending to be `read'.
 
-   WAITP is nonzero if we should block until input arrives.
    EXPECTED is nonzero if the caller knows input is available.  
 
    Some of these messages are reposted back to the message queue since the
@@ -2359,11 +2359,10 @@ is_dead_key (int wparam)
 */
 
 int
-w32_read_socket (sd, bufp, numchars, waitp, expected)
+w32_read_socket (sd, bufp, numchars, expected)
      register int sd;
      register struct input_event *bufp;
      register int numchars;
-     int waitp;
      int expected;
 {
   int count = 0;