[Emacs-diffs] Changes to emacs/src/w32term.c

[Jason Rumney]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.151 emacs/src/w32term.c:1.152
*** emacs/src/w32term.c:1.151   Wed Mar 20 15:58:03 2002
--- emacs/src/w32term.c Fri Mar 22 17:07:33 2002
***************
*** 86,92 ****
  #define zv_width 8
  #define zv_height 72
  #define zv_period 3
! static unsigned char 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,
--- 86,92 ----
  #define zv_width 8
  #define zv_height 72
  #define zv_period 3
! 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,8819 ****
                    y = XFASTINT (emacs_event.y);
  
                      /* Set x and y.  */
!                     window = window_from_coordinates (f,
!                                                       emacs_event.x,
!                                                       emacs_event.y,
!                                                       &p, 1);
                      if (EQ (window, f->tool_bar_window))
                        {
                          w32_handle_tool_bar_click (f, &emacs_event);
--- 8810,8817 ----
                    y = XFASTINT (emacs_event.y);
  
                      /* Set x and y.  */
!                     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,11422 ****
  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.
--- 11414,11419 ----
***************
*** 11424,11430 ****
  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.  */);
--- 11421,11426 ----