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

4 files changed, 63 insertions, 33 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2f028c48247..6638325a434 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2014-04-02  Martin Rudalics  <rudalics@gmx.at>
+
+        * xterm.c (x_new_font): Don't calculate non-toolkit scrollbar
+        width from font width (Bug#17163).
+
+        * frame.c (x_set_frame_parameters): Calculate default values of
+        new frame sizes only after all other frame parameters have been
+        processed (Bug#17142).
+
+2014-04-02  Ken Brown  <kbrown@cornell.edu>
+
+        * conf_post.h (SYSTEM_PURESIZE_EXTRA) [CYGWIN]: Set to 10000.
+        (Bug#17112)
+
+2014-04-02  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xterm.c (x_draw_image_glyph_string): Adjust image background
+        width accordingly when its x position is adjusted.  (Bug#17115)
+
 2014-04-02  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * font.c (font_list_entities): Do not add empty vector to font cache.
diff --git a/src/conf_post.h b/src/conf_post.h
index 7419b53c5df..80d561090ed 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -161,6 +161,10 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #endif
 #endif
 
+#ifdef CYGWIN
+#define SYSTEM_PURESIZE_EXTRA 10000
+#endif
+
 #if defined HAVE_NTGUI && !defined DebPrint
 # ifdef EMACSDEBUG
 extern void _DebPrint (const char *fmt, ...);
diff --git a/src/frame.c b/src/frame.c
index 055ce36ff4f..c5a2f6ab245 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2795,6 +2795,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
      set them both at once.  So we wait until we've looked at the
      entire list before we set them.  */
   int width, height;
+  bool width_change = 0, height_change = 0;
 
   /* Same here.  */
   Lisp_Object left, top;
@@ -2810,7 +2811,6 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
 #ifdef HAVE_X_WINDOWS
   bool icon_left_no_change = 0, icon_top_no_change = 0;
 #endif
-  bool size_changed = 0;
   struct gcpro gcpro1, gcpro2;
 
   i = 0;
@@ -2844,18 +2844,6 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
   top = left = Qunbound;
   icon_left = icon_top = Qunbound;
 
-  /* Provide default values for HEIGHT and WIDTH.  */
-  width = (f->new_width
-           ? (f->new_pixelwise
-              ? f->new_width
-              : (f->new_width * FRAME_COLUMN_WIDTH (f)))
-           : FRAME_TEXT_WIDTH (f));
-  height = (f->new_height
-            ? (f->new_pixelwise
-               ? f->new_height
-               : (f->new_height * FRAME_LINE_HEIGHT (f)))
-            : FRAME_TEXT_HEIGHT (f));
-
   /* Process foreground_color and background_color before anything else.
      They are independent of other properties, but other properties (e.g.,
      cursor_color) are dependent upon them.  */
@@ -2897,12 +2885,12 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
 
       if (EQ (prop, Qwidth) && RANGED_INTEGERP (0, val, INT_MAX))
         {
-          size_changed = 1;
+          width_change = 1;
           width = XFASTINT (val) * FRAME_COLUMN_WIDTH (f) ;
         }
       else if (EQ (prop, Qheight) && RANGED_INTEGERP (0, val, INT_MAX))
         {
-          size_changed = 1;
+          height_change = 1;
           height = XFASTINT (val) * FRAME_LINE_HEIGHT (f);
         }
       else if (EQ (prop, Qtop))
@@ -2989,11 +2977,30 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
 
     XSETFRAME (frame, f);
 
-    if (size_changed
+    if ((width_change || height_change)
         && (width != FRAME_TEXT_WIDTH (f)
             || height != FRAME_TEXT_HEIGHT (f)
             || f->new_height || f->new_width))
-      Fset_frame_size (frame, make_number (width), make_number (height), Qt);
+      {
+        /* If necessary provide default values for HEIGHT and WIDTH.  Do
+           that here since otherwise a size change implied by an
+           intermittent font change may get lost as in Bug#17142.  */
+        if (!width_change)
+          width = (f->new_width
+                   ? (f->new_pixelwise
+                      ? f->new_width
+                      : (f->new_width * FRAME_COLUMN_WIDTH (f)))
+                   : FRAME_TEXT_WIDTH (f));
+
+        if (!height_change)
+          height = (f->new_height
+                    ? (f->new_pixelwise
+                       ? f->new_height
+                       : (f->new_height * FRAME_LINE_HEIGHT (f)))
+                    : FRAME_TEXT_HEIGHT (f));
+
+        Fset_frame_size (frame, make_number (width), make_number (height), Qt);
+      }
 
     if ((!NILP (left) || !NILP (top))
         && ! (left_no_change && top_no_change)
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