[Emacs-diffs] /srv/bzr/emacs/trunk r112580: Another attempt to solve bug #14062 with assertion violations on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112580
fixes bug: http://debbugs.gnu.org/14062
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-14 17:09:43 +0300
message:
  Another attempt to solve bug #14062 with assertion violations on MS-Windows.
  
   src/w32fns.c (w32_wnd_proc): Don't call WINDOW_HEADER_LINE_HEIGHT
   unless we know that the window w is a leaf window.  Another
   attempt at solving bug#14062.
modified:
  src/ChangeLog
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-14 09:34:16 +0000
+++ b/src/ChangeLog     2013-05-14 14:09:43 +0000
@@ -1,3 +1,9 @@
+2013-05-14  Eli Zaretskii  <address@hidden>
+
+       * w32fns.c (w32_wnd_proc): Don't call WINDOW_HEADER_LINE_HEIGHT
+       unless we know that the window w is a leaf window.  Another
+       attempt at solving bug#14062.
+
 2013-05-14  Jan Djärv  <address@hidden>
 
        * nsfont.m (ns_spec_to_descriptor): Retain and autorelease

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2013-05-04 10:19:13 +0000
+++ b/src/w32fns.c      2013-05-14 14:09:43 +0000
@@ -3183,8 +3183,9 @@
          form.ptCurrentPos.y = w32_system_caret_y;
 
          form.rcArea.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, 0);
-         form.rcArea.top = (WINDOW_TOP_EDGE_Y (w)
-                            + WINDOW_HEADER_LINE_HEIGHT (w));
+         form.rcArea.top = WINDOW_TOP_EDGE_Y (w);
+         if (BUFFERP (w->contents))
+           form.rcArea.top += WINDOW_HEADER_LINE_HEIGHT (w);
          form.rcArea.right = (WINDOW_BOX_RIGHT_EDGE_X (w)
                               - WINDOW_RIGHT_MARGIN_WIDTH (w)
                               - WINDOW_RIGHT_FRINGE_WIDTH (w));