(struct w32_display_info) <x_highlight_frame>: Renamed from

w32_highlight_frame.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b15b68aa4fc9f082fa52e6df3db48f1bdbcaf8e..77f8118a2f56268e4cecfce574f972e0591172bf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -63,12 +63,15 @@
        (x_display_and_set_cursor): Use get_window_cursor_type.
        Remove unused local variables cursor_off_state.
        Redraw cursor if hbar cursor width changes.
-
+       Changed all occurrences of w32_highlight_frame to x_highlight_frame.
+       
        * w32term.h (enum text_cursor_kinds): Removed.
        (struct output_w32) <current_cursor, desired_cursor, cursor_width>
        <blink_off_cursor, blink_off_cursor_width>: Members removed.
        (FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR)
        (FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed.
+       (struct w32_display_info) <x_highlight_frame>: Renamed member from
+       w32_highlight_frame.
        
        * xfns.c (Vblink_cursor_alist): Removed.
        (Qbar, Qhbar, Qbox, Qhollow): Removed.

diff --git a/src/w32term.h b/src/w32term.h
index a2620ecff5b379e9ebe4fd6ff8670ca4b3f0edd7..5b0c5401c252470da4d2230c7b3fea4919ff4c82 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -227,7 +227,7 @@ struct w32_display_info
      event).  It points to the focus frame's selected window's
      frame.  It differs from w32_focus_frame when we're using a global
      minibuffer.  */
-  struct frame *w32_highlight_frame;
+  struct frame *x_highlight_frame;
 
   /* Cache of images.  */
   struct image_cache *image_cache;