Rename x_highlight_frame property to highlight_frame

* src/nsterm.h:
* src/nsterm.m:
* src/w32term.c:
* src/w32term.h:
* src/xdisp.c:
* src/xterm.c:
* src/xterm.h: Rename.

diff --git a/src/nsterm.h b/src/nsterm.h
index 41cdaccbc79137072e1de628b7b7903a18d67139..683f2dd934184e43671c16fae9c9267ecb1b9317 100644 (file)
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -881,7 +881,7 @@ struct ns_display_info
      mouse-face.  */
   Mouse_HLInfo mouse_highlight;
 
-  struct frame *x_highlight_frame;
+  struct frame *highlight_frame;
   struct frame *ns_focus_frame;
 
   /* The frame where the mouse was last time we reported a mouse event.  */

diff --git a/src/nsterm.m b/src/nsterm.m
index cf1ff055304d65c7e1a836220b758e5420ec43bf..cdf1916e71ba031e37ccf5b217421fb33e87b321 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1540,36 +1540,36 @@ ns_frame_rehighlight (struct frame *frame)
    -------------------------------------------------------------------------- */
 {
   struct ns_display_info *dpyinfo = FRAME_DISPLAY_INFO (frame);
-  struct frame *old_highlight = dpyinfo->x_highlight_frame;
+  struct frame *old_highlight = dpyinfo->highlight_frame;
 
   NSTRACE ("ns_frame_rehighlight");
   if (dpyinfo->ns_focus_frame)
     {
-      dpyinfo->x_highlight_frame
+      dpyinfo->highlight_frame
        = (FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->ns_focus_frame))
            ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->ns_focus_frame))
            : dpyinfo->ns_focus_frame);
-      if (!FRAME_LIVE_P (dpyinfo->x_highlight_frame))
+      if (!FRAME_LIVE_P (dpyinfo->highlight_frame))
         {
           fset_focus_frame (dpyinfo->ns_focus_frame, Qnil);
-          dpyinfo->x_highlight_frame = dpyinfo->ns_focus_frame;
+          dpyinfo->highlight_frame = dpyinfo->ns_focus_frame;
         }
     }
   else
-      dpyinfo->x_highlight_frame = 0;
+      dpyinfo->highlight_frame = 0;
 
-  if (dpyinfo->x_highlight_frame &&
-         dpyinfo->x_highlight_frame != old_highlight)
+  if (dpyinfo->highlight_frame &&
+         dpyinfo->highlight_frame != old_highlight)
     {
       if (old_highlight)
        {
           gui_update_cursor (old_highlight, 1);
          ns_set_frame_alpha (old_highlight);
        }
-      if (dpyinfo->x_highlight_frame)
+      if (dpyinfo->highlight_frame)
        {
-          gui_update_cursor (dpyinfo->x_highlight_frame, 1);
-          ns_set_frame_alpha (dpyinfo->x_highlight_frame);
+          gui_update_cursor (dpyinfo->highlight_frame, 1);
+          ns_set_frame_alpha (dpyinfo->highlight_frame);
        }
     }
 }
@@ -1667,8 +1667,8 @@ ns_iconify_frame (struct frame *f)
   view = FRAME_NS_VIEW (f);
   dpyinfo = FRAME_DISPLAY_INFO (f);
 
-  if (dpyinfo->x_highlight_frame == f)
-    dpyinfo->x_highlight_frame = 0;
+  if (dpyinfo->highlight_frame == f)
+    dpyinfo->highlight_frame = 0;
 
   if ([[view window] windowNumber] <= 0)
     {
@@ -1714,8 +1714,8 @@ ns_free_frame_resources (struct frame *f)
 
   if (f == dpyinfo->ns_focus_frame)
     dpyinfo->ns_focus_frame = 0;
-  if (f == dpyinfo->x_highlight_frame)
-    dpyinfo->x_highlight_frame = 0;
+  if (f == dpyinfo->highlight_frame)
+    dpyinfo->highlight_frame = 0;
   if (f == hlinfo->mouse_face_mouse_frame)
     reset_mouse_highlight (hlinfo);
 
@@ -2468,7 +2468,7 @@ ns_set_frame_alpha (struct frame *f)
 
   NSTRACE ("ns_set_frame_alpha");
 
-  if (dpyinfo->x_highlight_frame == f)
+  if (dpyinfo->highlight_frame == f)
     alpha = f->alpha[0];
   else
     alpha = f->alpha[1];
@@ -5142,7 +5142,7 @@ ns_initialize_display_info (struct ns_display_info *dpyinfo)
     dpyinfo->color_table = xmalloc (sizeof *dpyinfo->color_table);
     dpyinfo->color_table->colors = NULL;
     dpyinfo->root_window = 42; /* A placeholder.  */
-    dpyinfo->x_highlight_frame = dpyinfo->ns_focus_frame = NULL;
+    dpyinfo->highlight_frame = dpyinfo->ns_focus_frame = NULL;
     dpyinfo->n_fonts = 0;
     dpyinfo->smallest_font_height = 1;
     dpyinfo->smallest_char_width = 1;

diff --git a/src/w32term.c b/src/w32term.c
index 65c1baf20f6f0a2d75693e951dd6dad2de84472e..3811585d0f6a9fdd58707b470795928bdadbb6ba 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3036,29 +3036,29 @@ w32_frame_rehighlight (struct frame *frame)
 static void
 w32_frame_rehighlight_1 (struct w32_display_info *dpyinfo)
 {
-  struct frame *old_highlight = dpyinfo->x_highlight_frame;
+  struct frame *old_highlight = dpyinfo->highlight_frame;
 
   if (dpyinfo->w32_focus_frame)
     {
-      dpyinfo->x_highlight_frame
+      dpyinfo->highlight_frame
        = ((FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)))
           ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))
           : dpyinfo->w32_focus_frame);
-      if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame))
+      if (! FRAME_LIVE_P (dpyinfo->highlight_frame))
        {
          fset_focus_frame (dpyinfo->w32_focus_frame, Qnil);
-         dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame;
+         dpyinfo->highlight_frame = dpyinfo->w32_focus_frame;
        }
     }
   else
-    dpyinfo->x_highlight_frame = 0;
+    dpyinfo->highlight_frame = 0;
 
-  if (dpyinfo->x_highlight_frame != old_highlight)
+  if (dpyinfo->highlight_frame != old_highlight)
     {
       if (old_highlight)
        w32_frame_unhighlight (old_highlight);
-      if (dpyinfo->x_highlight_frame)
-       w32_frame_highlight (dpyinfo->x_highlight_frame);
+      if (dpyinfo->highlight_frame)
+       w32_frame_highlight (dpyinfo->highlight_frame);
     }
 }
 \f
@@ -6822,8 +6822,8 @@ void
 w32_make_frame_invisible (struct frame *f)
 {
   /* Don't keep the highlight on an invisible frame.  */
-  if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
-    FRAME_DISPLAY_INFO (f)->x_highlight_frame = 0;
+  if (FRAME_DISPLAY_INFO (f)->highlight_frame == f)
+    FRAME_DISPLAY_INFO (f)->highlight_frame = 0;
 
   block_input ();
 
@@ -6855,8 +6855,8 @@ void
 w32_iconify_frame (struct frame *f)
 {
   /* Don't keep the highlight on an invisible frame.  */
-  if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
-    FRAME_DISPLAY_INFO (f)->x_highlight_frame = 0;
+  if (FRAME_DISPLAY_INFO (f)->highlight_frame == f)
+    FRAME_DISPLAY_INFO (f)->highlight_frame = 0;
 
   if (FRAME_ICONIFIED_P (f))
     return;
@@ -6903,8 +6903,8 @@ w32_free_frame_resources (struct frame *f)
     dpyinfo->w32_focus_frame = 0;
   if (f == dpyinfo->w32_focus_event_frame)
     dpyinfo->w32_focus_event_frame = 0;
-  if (f == dpyinfo->x_highlight_frame)
-    dpyinfo->x_highlight_frame = 0;
+  if (f == dpyinfo->highlight_frame)
+    dpyinfo->highlight_frame = 0;
   if (f == hlinfo->mouse_face_mouse_frame)
     reset_mouse_highlight (hlinfo);
 

diff --git a/src/w32term.h b/src/w32term.h
index d5bb08dc675abb6081ae8dba091e60c845919329..de372d7e5d7d1cdbbca0a5bb2dea227bf003aa30 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -182,7 +182,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 *x_highlight_frame;
+  struct frame *highlight_frame;
 
   /* The frame waiting to be auto-raised in w32_read_socket.  */
   struct frame *w32_pending_autoraise_frame;

diff --git a/src/xdisp.c b/src/xdisp.c
index 34e89c79046ff44893902bd5428c805aa670d760..9f0739e0c6142de657f8b3a66c01c708831402f6 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -29306,7 +29306,7 @@ get_window_cursor_type (struct window *w, struct glyph *glyph, int *width,
 
   /* Detect a nonselected window or nonselected frame.  */
   else if (w != XWINDOW (f->selected_window)
-          || f != FRAME_DISPLAY_INFO (f)->x_highlight_frame)
+          || f != FRAME_DISPLAY_INFO (f)->highlight_frame)
     {
       *active_cursor = false;
 

diff --git a/src/xterm.c b/src/xterm.c
index c710d1c918b265b89c98140ba96fd28dc1f6629e..dd19b8bde1546b115ba8a6b9d5f81808fcb23493 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -917,7 +917,7 @@ x_set_frame_alpha (struct frame *f)
   unsigned long opac;
   Window parent;
 
-  if (dpyinfo->x_highlight_frame == f)
+  if (dpyinfo->highlight_frame == f)
     alpha = f->alpha[0];
   else
     alpha = f->alpha[1];
@@ -4718,29 +4718,29 @@ XTframe_rehighlight (struct frame *frame)
 static void
 x_frame_rehighlight (struct x_display_info *dpyinfo)
 {
-  struct frame *old_highlight = dpyinfo->x_highlight_frame;
+  struct frame *old_highlight = dpyinfo->highlight_frame;
 
   if (dpyinfo->x_focus_frame)
     {
-      dpyinfo->x_highlight_frame
+      dpyinfo->highlight_frame
        = ((FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->x_focus_frame)))
           ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->x_focus_frame))
           : dpyinfo->x_focus_frame);
-      if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame))
+      if (! FRAME_LIVE_P (dpyinfo->highlight_frame))
        {
          fset_focus_frame (dpyinfo->x_focus_frame, Qnil);
-         dpyinfo->x_highlight_frame = dpyinfo->x_focus_frame;
+         dpyinfo->highlight_frame = dpyinfo->x_focus_frame;
        }
     }
   else
-    dpyinfo->x_highlight_frame = 0;
+    dpyinfo->highlight_frame = 0;
 
-  if (dpyinfo->x_highlight_frame != old_highlight)
+  if (dpyinfo->highlight_frame != old_highlight)
     {
       if (old_highlight)
        x_frame_unhighlight (old_highlight);
-      if (dpyinfo->x_highlight_frame)
-       x_frame_highlight (dpyinfo->x_highlight_frame);
+      if (dpyinfo->highlight_frame)
+       x_frame_highlight (dpyinfo->highlight_frame);
     }
 }
 
@@ -8907,7 +8907,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                   into a parent frame with the child frame selected and
                   `no-accept-focus' is not set, select the clicked
                   frame.  */
-               struct frame *hf = dpyinfo->x_highlight_frame;
+               struct frame *hf = dpyinfo->highlight_frame;
 
                if (FRAME_PARENT_FRAME (f) || (hf && frame_ancestor_p (f, hf)))
                  {
@@ -11674,8 +11674,8 @@ x_make_frame_invisible (struct frame *f)
   window = FRAME_OUTER_WINDOW (f);
 
   /* Don't keep the highlight on an invisible frame.  */
-  if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
-    FRAME_DISPLAY_INFO (f)->x_highlight_frame = 0;
+  if (FRAME_DISPLAY_INFO (f)->highlight_frame == f)
+    FRAME_DISPLAY_INFO (f)->highlight_frame = 0;
 
   block_input ();
 
@@ -11735,8 +11735,8 @@ x_iconify_frame (struct frame *f)
 #endif
 
   /* Don't keep the highlight on an invisible frame.  */
-  if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
-    FRAME_DISPLAY_INFO (f)->x_highlight_frame = 0;
+  if (FRAME_DISPLAY_INFO (f)->highlight_frame == f)
+    FRAME_DISPLAY_INFO (f)->highlight_frame = 0;
 
   if (FRAME_ICONIFIED_P (f))
     return;
@@ -11999,8 +11999,8 @@ x_free_frame_resources (struct frame *f)
     dpyinfo->x_focus_frame = 0;
   if (f == dpyinfo->x_focus_event_frame)
     dpyinfo->x_focus_event_frame = 0;
-  if (f == dpyinfo->x_highlight_frame)
-    dpyinfo->x_highlight_frame = 0;
+  if (f == dpyinfo->highlight_frame)
+    dpyinfo->highlight_frame = 0;
   if (f == hlinfo->mouse_face_mouse_frame)
     reset_mouse_highlight (hlinfo);
 

diff --git a/src/xterm.h b/src/xterm.h
index f4007d6e7f3d33e1b4bc0c39aeb768853299807f..266a42afa08030ab5b26cb0f9287958191a20b64 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -350,7 +350,7 @@ struct x_display_info
      event).  It points to the X focus frame's selected window's
      frame.  It differs from x_focus_frame when we're using a global
      minibuffer.  */
-  struct frame *x_highlight_frame;
+  struct frame *highlight_frame;
 
   /* The frame waiting to be auto-raised in XTread_socket.  */
   struct frame *x_pending_autoraise_frame;