(struct w32_display_info) <x_highlight_frame>: Renamed from

w32_highlight_frame.

2 files changed, 5 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b15b68aa4f..77f8118a2f5 100644
--- 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 a2620ecff5b..5b0c5401c25 100644
--- 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;