diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-04-25 08:42:21 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-25 08:42:21 -0600 |
| commit | d04e55b2486f0684afb7e77e07c91231583d4e67 (patch) | |
| tree | be8c3c3ba5127b40f8c7671ed02adb98a791b625 | |
| parent | 43a3a28209b7b138e0c4c1919e76630968882db5 (diff) | |
| download | emacs-d04e55b2486f0684afb7e77e07c91231583d4e67.tar.gz | |
fixup! Rename non-X x_* identifiers
| -rw-r--r-- | src/w32term.c | 8 | ||||
| -rw-r--r-- | src/w32term.h | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/w32term.c b/src/w32term.c index da3131430d9..3811585d0f6 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -168,7 +168,7 @@ static void w32_handle_tool_bar_click (struct frame *, struct input_event *); static void w32_define_cursor (Window, Cursor); -void w32_scroll_bar_clear (struct frame *); +static void w32_scroll_bar_clear (struct frame *); static void w32_raise_frame (struct frame *); static void w32_lower_frame (struct frame *); static void w32_initialize (void); @@ -184,7 +184,7 @@ static void w32_focus_changed (int, int, struct w32_display_info *, static void w32_detect_focus_change (struct w32_display_info *, W32Msg *, struct input_event *); static void w32_frame_rehighlight (struct frame *); -static void w32_frame_rehighlight (struct w32_display_info *); +static void w32_frame_rehighlight_1 (struct w32_display_info *); static void w32_draw_hollow_cursor (struct window *, struct glyph_row *); static void w32_draw_bar_cursor (struct window *, struct glyph_row *, int, enum text_cursor_kinds); @@ -3030,11 +3030,11 @@ w32_frame_rehighlight (struct frame *frame) { if (! FRAME_W32_P (frame)) return; - w32_reframe_highlight_1 (FRAME_DISPLAY_INFO (frame)); + w32_frame_rehighlight_1 (FRAME_DISPLAY_INFO (frame)); } static void -w32_reframe_highlight_1 (struct w32_display_info *dpyinfo) +w32_frame_rehighlight_1 (struct w32_display_info *dpyinfo) { struct frame *old_highlight = dpyinfo->highlight_frame; diff --git a/src/w32term.h b/src/w32term.h index c030d9f2d6b..6d2604fb33e 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -231,6 +231,8 @@ extern struct frame *w32_window_to_frame (struct w32_display_info *, HWND); extern void w32_real_positions (struct frame *f, int *xptr, int *yptr); +extern void w32_clear_under_internal_border (struct frame *); + extern void w32_change_tool_bar_height (struct frame *, int); extern void w32_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); extern void w32_set_scroll_bar_default_width (struct frame *); diff --git a/src/xdisp.c b/src/xdisp.c index 69edb600521..2c67156198b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13158,7 +13158,7 @@ note_tool_bar_highlight (struct frame *f, int x, int y) clear_mouse_face (hlinfo); /* Mouse is down, but on different tool-bar item? */ - mouse_down_p = (x_mouse_grabbed (dpyinfo) + mouse_down_p = (gui_mouse_grabbed (dpyinfo) && f == dpyinfo->last_mouse_frame); if (mouse_down_p && f->last_tool_bar_item != prop_idx) |