Mercurial > emacs
changeset 44095:cdcab7b110f6
(zv_bits): Declare as short, for word alignment.
(w32_read_socket) <WM_XBUTTONUP>: Fix last change.
(syms_of_w32term): Define x-use-underline-position-properties.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Fri, 22 Mar 2002 22:07:33 +0000 |
| parents | 16eb7bad861d |
| children | 2c2a8c707b7c |
| files | src/w32term.c |
| diffstat | 1 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32term.c Fri Mar 22 22:00:42 2002 +0000 +++ b/src/w32term.c Fri Mar 22 22:07:33 2002 +0000 @@ -86,7 +86,7 @@ #define zv_width 8 #define zv_height 72 #define zv_period 3 -static unsigned char zv_bits[] = { +static unsigned short zv_bits[] = { 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, @@ -8810,10 +8810,8 @@ y = XFASTINT (emacs_event.y); /* Set x and y. */ - window = window_from_coordinates (f, - emacs_event.x, - emacs_event.y, - &p, 1); + window = window_from_coordinates (f, x, y, &p, 1); + if (EQ (window, f->tool_bar_window)) { w32_handle_tool_bar_click (f, &emacs_event); @@ -11416,7 +11414,6 @@ wide as that tab on the display. */); x_stretch_cursor_p = 0; -#if 0 /* TODO: Setting underline position from font properties. */ DEFVAR_BOOL ("x-use-underline-position-properties", &x_use_underline_position_properties, doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. @@ -11424,7 +11421,6 @@ UNDERLINE_POSITION font properties, for example 7x13 on XFree prior to 4.1, set this to nil. */); x_use_underline_position_properties = 1; -#endif DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, doc: /* If not nil, Emacs uses toolkit scroll bars. */);