1 files changed, 43 insertions, 21 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 5df7896a2b3..466037c75a2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -181,6 +181,10 @@ static Lisp_Object last_window;
 
 int x_use_underline_position_properties;
 
+/* Non-zero means to draw the underline at the same place as the descent line.  */
+
+int x_underline_at_descent_line;
+
 /* This is a chain of structures for all the X displays currently in
    use.  */
 
@@ -2601,7 +2605,9 @@ x_draw_stretch_glyph_string (s)
       int background_width = s->background_width;
       int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA);
 
-      if (x < left_x)
+      /* Don't draw into left margin, fringe or scrollbar area
+         except for header line and mode line.  */
+      if (x < left_x && !s->row->mode_line_p)
         {
           background_width -= left_x - x;
           x = left_x;
@@ -2695,32 +2701,35 @@ x_draw_glyph_string (s)
           if (!XGetFontProperty (s->font, XA_UNDERLINE_THICKNESS, &h))
             h = 1;
 
-          /* Get the underline position.  This is the recommended
-             vertical offset in pixels from the baseline to the top of
-             the underline.  This is a signed value according to the
-             specs, and its default is
-
-             ROUND ((maximum descent) / 2), with
-             ROUND(x) = floor (x + 0.5)  */
-
-          if (x_use_underline_position_properties
-              && XGetFontProperty (s->font, XA_UNDERLINE_POSITION, &tem))
-            y = s->ybase + (long) tem;
-          else if (s->face->font)
-            y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
-          else
+          if (x_underline_at_descent_line)
             y = s->y + s->height - h;
+          else
+            {
+              /* Get the underline position.  This is the recommended
+                 vertical offset in pixels from the baseline to the top of
+                 the underline.  This is a signed value according to the
+                 specs, and its default is
+
+                 ROUND ((maximum descent) / 2), with
+                 ROUND(x) = floor (x + 0.5)  */
+
+              if (x_use_underline_position_properties
+                  && XGetFontProperty (s->font, XA_UNDERLINE_POSITION, &tem))
+                y = s->ybase + (long) tem;
+              else if (s->face->font)
+                y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
+            }
 
           if (s->face->underline_defaulted_p)
             XFillRectangle (s->display, s->window, s->gc,
-                            s->x, y, s->width, h);
+                            s->x, y, s->background_width, h);
           else
             {
               XGCValues xgcv;
               XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
               XSetForeground (s->display, s->gc, s->face->underline_color);
               XFillRectangle (s->display, s->window, s->gc,
-                              s->x, y, s->width, h);
+                              s->x, y, s->background_width, h);
               XSetForeground (s->display, s->gc, xgcv.foreground);
             }
         }
@@ -2732,14 +2741,14 @@ x_draw_glyph_string (s)
 
           if (s->face->overline_color_defaulted_p)
             XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy,
-                            s->width, h);
+                            s->background_width, h);
           else
             {
               XGCValues xgcv;
               XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
               XSetForeground (s->display, s->gc, s->face->overline_color);
               XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy,
-                              s->width, h);
+                              s->background_width, h);
               XSetForeground (s->display, s->gc, xgcv.foreground);
             }
         }
@@ -10096,8 +10105,8 @@ x_query_font (f, fontname)
 
   for (i = 0; i < dpyinfo->n_fonts; i++)
     if (dpyinfo->font_table[i].name
-        && (!strcmp (dpyinfo->font_table[i].name, fontname)
-            || !strcmp (dpyinfo->font_table[i].full_name, fontname)))
+        && (!strcasecmp (dpyinfo->font_table[i].name, fontname)
+            || !strcasecmp (dpyinfo->font_table[i].full_name, fontname)))
       return (dpyinfo->font_table + i);
   return NULL;
 }
@@ -10644,6 +10653,11 @@ x_term_init (display_name, xrm_option, resource_name)
 
   dpyinfo->cut_buffers_initialized = 0;
 
+  dpyinfo->x_dnd_atoms_size = 8;
+  dpyinfo->x_dnd_atoms_length = 0;
+  dpyinfo->x_dnd_atoms = xmalloc (sizeof (*dpyinfo->x_dnd_atoms)
+                                  * dpyinfo->x_dnd_atoms_size);
+
   connection = ConnectionNumber (dpyinfo->display);
   dpyinfo->connection = connection;
 
@@ -11104,6 +11118,14 @@ UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
 to 4.1, set this to nil.  */);
   x_use_underline_position_properties = 1;
 
+  DEFVAR_BOOL ("x-underline-at-descent-line",
+               &x_underline_at_descent_line,
+     doc: /* *Non-nil means to draw the underline at the same place as the descent line.
+nil means to draw the underline according to the value of the variable
+`x-use-underline-position-properties', which is usually at the baseline
+level.  The default value is nil.  */);
+  x_underline_at_descent_line = 0;
+
   DEFVAR_BOOL ("x-mouse-click-focus-ignore-position",
                &x_mouse_click_focus_ignore_position,
     doc: /* Non-nil means that a mouse click to focus a frame does not move point.