summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2002-08-30 13:19:45 +0000
committerKim F. Storm <storm@cua.dk>2002-08-30 13:19:45 +0000
commit4baaed0f99d1d5f8a22286f48d6fd059f14418c7 (patch)
tree5c6cb7bc68686209149733a9009dd2f623d763b6
parentda337a287b558e198b7fb09da16fd73228c6bfcb (diff)
downloademacs-4baaed0f99d1d5f8a22286f48d6fd059f14418c7.tar.gz
emacs-4baaed0f99d1d5f8a22286f48d6fd059f14418c7.tar.bz2
emacs-4baaed0f99d1d5f8a22286f48d6fd059f14418c7.zip
Changed all occurrences of w32_highlight_frame with x_highlight_frame.
-rw-r--r--src/w32term.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/w32term.c b/src/w32term.c
index 64643dadc77..bde0388bce3 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6001,29 +6001,29 @@ static void
x_frame_rehighlight (dpyinfo)
struct w32_display_info *dpyinfo;
{
- struct frame *old_highlight = dpyinfo->w32_highlight_frame;
+ struct frame *old_highlight = dpyinfo->x_highlight_frame;
if (dpyinfo->w32_focus_frame)
{
- dpyinfo->w32_highlight_frame
+ dpyinfo->x_highlight_frame
= ((GC_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->w32_highlight_frame))
+ if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame))
{
FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil;
- dpyinfo->w32_highlight_frame = dpyinfo->w32_focus_frame;
+ dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame;
}
}
else
- dpyinfo->w32_highlight_frame = 0;
+ dpyinfo->x_highlight_frame = 0;
- if (dpyinfo->w32_highlight_frame != old_highlight)
+ if (dpyinfo->x_highlight_frame != old_highlight)
{
if (old_highlight)
frame_unhighlight (old_highlight);
- if (dpyinfo->w32_highlight_frame)
- frame_highlight (dpyinfo->w32_highlight_frame);
+ if (dpyinfo->x_highlight_frame)
+ frame_highlight (dpyinfo->x_highlight_frame);
}
}
@@ -10757,8 +10757,8 @@ x_make_frame_invisible (f)
struct frame *f;
{
/* Don't keep the highlight on an invisible frame. */
- if (FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame == f)
- FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame = 0;
+ if (FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame == f)
+ FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame = 0;
BLOCK_INPUT;
@@ -10786,8 +10786,8 @@ x_iconify_frame (f)
Lisp_Object type;
/* Don't keep the highlight on an invisible frame. */
- if (FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame == f)
- FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame = 0;
+ if (FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame == f)
+ FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame = 0;
if (f->async_iconified)
return;
@@ -10841,8 +10841,8 @@ x_free_frame_resources (f)
dpyinfo->w32_focus_frame = 0;
if (f == dpyinfo->w32_focus_event_frame)
dpyinfo->w32_focus_event_frame = 0;
- if (f == dpyinfo->w32_highlight_frame)
- dpyinfo->w32_highlight_frame = 0;
+ if (f == dpyinfo->x_highlight_frame)
+ dpyinfo->x_highlight_frame = 0;
if (f == dpyinfo->mouse_face_mouse_frame)
{