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

[Eli Zaretskii]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.224 emacs/src/w32term.c:1.225
*** emacs/src/w32term.c:1.224   Sat Mar 26 00:19:53 2005
--- emacs/src/w32term.c Mon Jun 13 12:18:31 2005
***************
*** 87,92 ****
--- 87,96 ----
  /* Last window where we saw the mouse.  Used by mouse-autoselect-window.  */
  static Lisp_Object last_window;
  
+ /* Non-zero means make use of UNDERLINE_POSITION font properties.
+    (Not yet supported, see TODO in x_draw_glyph_string.)  */
+ int x_use_underline_position_properties;
+ 
  extern unsigned int msh_mousewheel;
  
  extern void free_frame_menubar ();
***************
*** 2488,2494 ****
            unsigned long dy = s->height - h;
  
          /* TODO: Use font information for positioning and thickness
!            of underline.  See OUTLINETEXTMETRIC, and xterm.c.  */
            if (s->face->underline_defaulted_p)
              {
                w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
--- 2492,2500 ----
            unsigned long dy = s->height - h;
  
          /* TODO: Use font information for positioning and thickness
!            of underline.  See OUTLINETEXTMETRIC, and xterm.c.
!            Note: If you make this work, don't forget to change the
!            doc string of x-use-underline-position-properties below.  */
            if (s->face->underline_defaulted_p)
              {
                w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
***************
*** 6536,6541 ****
--- 6542,6559 ----
                             &w32_use_visible_system_caret, 0))
      w32_use_visible_system_caret = 0;
  
+   /* We don't yet support this, but defining this here avoids whining
+      from cus-start.el and other places, like "M-x set-variable".  */
+   DEFVAR_BOOL ("x-use-underline-position-properties",
+              &x_use_underline_position_properties,
+      doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties.
+ nil means ignore them.  If you encounter fonts with bogus
+ UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
+ to 4.1, set this to nil.
+ 
+ NOTE: Not supported on MS-Windows yet.  */);
+   x_use_underline_position_properties = 0;
+ 
    DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
               doc: /* If not nil, Emacs uses toolkit scroll bars.  */);
    Vx_toolkit_scroll_bars = Qt;