aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2002-08-30 13:19:45 +0000
committerKim F. Storm2002-08-30 13:19:45 +0000
commit4baaed0f99d1d5f8a22286f48d6fd059f14418c7 (patch)
tree5c6cb7bc68686209149733a9009dd2f623d763b6 /src
parentda337a287b558e198b7fb09da16fd73228c6bfcb (diff)
downloademacs-4baaed0f99d1d5f8a22286f48d6fd059f14418c7.tar.gz
emacs-4baaed0f99d1d5f8a22286f48d6fd059f14418c7.zip
Changed all occurrences of w32_highlight_frame with x_highlight_frame.
Diffstat (limited to 'src')
-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
6001x_frame_rehighlight (dpyinfo) 6001x_frame_rehighlight (dpyinfo)
6002 struct w32_display_info *dpyinfo; 6002 struct w32_display_info *dpyinfo;
6003{ 6003{
6004 struct frame *old_highlight = dpyinfo->w32_highlight_frame; 6004 struct frame *old_highlight = dpyinfo->x_highlight_frame;
6005 6005
6006 if (dpyinfo->w32_focus_frame) 6006 if (dpyinfo->w32_focus_frame)
6007 { 6007 {
6008 dpyinfo->w32_highlight_frame 6008 dpyinfo->x_highlight_frame
6009 = ((GC_FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))) 6009 = ((GC_FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)))
6010 ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)) 6010 ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))
6011 : dpyinfo->w32_focus_frame); 6011 : dpyinfo->w32_focus_frame);
6012 if (! FRAME_LIVE_P (dpyinfo->w32_highlight_frame)) 6012 if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame))
6013 { 6013 {
6014 FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil; 6014 FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil;
6015 dpyinfo->w32_highlight_frame = dpyinfo->w32_focus_frame; 6015 dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame;
6016 } 6016 }
6017 } 6017 }
6018 else 6018 else
6019 dpyinfo->w32_highlight_frame = 0; 6019 dpyinfo->x_highlight_frame = 0;
6020 6020
6021 if (dpyinfo->w32_highlight_frame != old_highlight) 6021 if (dpyinfo->x_highlight_frame != old_highlight)
6022 { 6022 {
6023 if (old_highlight) 6023 if (old_highlight)
6024 frame_unhighlight (old_highlight); 6024 frame_unhighlight (old_highlight);
6025 if (dpyinfo->w32_highlight_frame) 6025 if (dpyinfo->x_highlight_frame)
6026 frame_highlight (dpyinfo->w32_highlight_frame); 6026 frame_highlight (dpyinfo->x_highlight_frame);
6027 } 6027 }
6028} 6028}
6029 6029
@@ -10757,8 +10757,8 @@ x_make_frame_invisible (f)
10757 struct frame *f; 10757 struct frame *f;
10758{ 10758{
10759 /* Don't keep the highlight on an invisible frame. */ 10759 /* Don't keep the highlight on an invisible frame. */
10760 if (FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame == f) 10760 if (FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame == f)
10761 FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame = 0; 10761 FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame = 0;
10762 10762
10763 BLOCK_INPUT; 10763 BLOCK_INPUT;
10764 10764
@@ -10786,8 +10786,8 @@ x_iconify_frame (f)
10786 Lisp_Object type; 10786 Lisp_Object type;
10787 10787
10788 /* Don't keep the highlight on an invisible frame. */ 10788 /* Don't keep the highlight on an invisible frame. */
10789 if (FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame == f) 10789 if (FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame == f)
10790 FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame = 0; 10790 FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame = 0;
10791 10791
10792 if (f->async_iconified) 10792 if (f->async_iconified)
10793 return; 10793 return;
@@ -10841,8 +10841,8 @@ x_free_frame_resources (f)
10841 dpyinfo->w32_focus_frame = 0; 10841 dpyinfo->w32_focus_frame = 0;
10842 if (f == dpyinfo->w32_focus_event_frame) 10842 if (f == dpyinfo->w32_focus_event_frame)
10843 dpyinfo->w32_focus_event_frame = 0; 10843 dpyinfo->w32_focus_event_frame = 0;
10844 if (f == dpyinfo->w32_highlight_frame) 10844 if (f == dpyinfo->x_highlight_frame)
10845 dpyinfo->w32_highlight_frame = 0; 10845 dpyinfo->x_highlight_frame = 0;
10846 10846
10847 if (f == dpyinfo->mouse_face_mouse_frame) 10847 if (f == dpyinfo->mouse_face_mouse_frame)
10848 { 10848 {