Merge from emacs-24; up to 2014-03-28T01:39:30Z!rgm@gnu.org

1 files changed, 16 insertions, 16 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 1c0aea01f6e..b0d64dfeb7f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2399,15 +2399,19 @@ x_draw_image_glyph_string (struct glyph_string *s)
         {
           int x = s->x;
           int y = s->y;
+          int width = s->background_width;
 
           if (s->first_glyph->left_box_line_p
               && s->slice.x == 0)
-            x += box_line_hwidth;
+            {
+              x += box_line_hwidth;
+              width -= box_line_hwidth;
+            }
 
           if (s->slice.y == 0)
             y += box_line_vwidth;
 
-          x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height);
+          x_draw_glyph_string_bg_rect (s, x, y, width, height);
         }
 
       s->background_filled_p = 1;
@@ -7775,20 +7779,16 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
 
   compute_fringe_widths (f, 1);
 
+  /* Compute character columns occupied by scrollbar.
+
+     Don't do things differently for non-toolkit scrollbars
+     (Bug#17163).  */
   unit = FRAME_COLUMN_WIDTH (f);
-#ifdef USE_TOOLKIT_SCROLL_BARS
-  /* The width of a toolkit scrollbar does not change with the new
-     font but we have to calculate the number of columns it occupies
-     anew.  */
-  FRAME_CONFIG_SCROLL_BAR_COLS (f)
-    = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) + unit - 1) / unit;
-#else
-  /* The width of a non-toolkit scrollbar is at least 14 pixels and a
-     multiple of the frame's character width.  */
-  FRAME_CONFIG_SCROLL_BAR_COLS (f) = (14 + unit - 1) / unit;
-  FRAME_CONFIG_SCROLL_BAR_WIDTH (f)
-    = FRAME_CONFIG_SCROLL_BAR_COLS (f) * unit;
-#endif  
+  if (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0)
+    FRAME_CONFIG_SCROLL_BAR_COLS (f)
+      = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) + unit - 1) / unit;
+  else
+    FRAME_CONFIG_SCROLL_BAR_COLS (f) = (14 + unit - 1) / unit;
 
   if (FRAME_X_WINDOW (f) != 0)
     {
@@ -7994,7 +7994,7 @@ xim_close_dpy (struct x_display_info *dpyinfo)
     {
 #ifdef HAVE_X11R6_XIM
       struct xim_inst_t *xim_inst = dpyinfo->xim_callback_data;
-      
+
       if (dpyinfo->display)
         {
           Bool ret = XUnregisterIMInstantiateCallback