Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm@gnu.org

[bpt/emacs.git] / src / w32fns.c

diff --git a/src/w32fns.c b/src/w32fns.c
index 0785e68..6658134 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3183,28 +3183,8 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
          form.ptCurrentPos.y = w32_system_caret_y;
 
          form.rcArea.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, 0);
-
-#ifdef ENABLE_CHECKING
-         /* Temporary code to catch crashes in computing form.rcArea.top.  */
-         eassert (FRAMEP (w->frame));
-         eassert (BUFFERP (w->contents));
-         {
-           int wmbp = WINDOW_MENU_BAR_P (w);
-           int wtbp = WINDOW_TOOL_BAR_P (w);
-           struct frame *wf = WINDOW_XFRAME (w);
-           int fibw = FRAME_INTERNAL_BORDER_WIDTH (wf);
-           int wtel = WINDOW_TOP_EDGE_LINE (w);
-           int wflh = FRAME_LINE_HEIGHT (wf);
-           int wwhlp= WINDOW_WANTS_HEADER_LINE_P (w);
-           int chlh = CURRENT_HEADER_LINE_HEIGHT (w);
-           int whlh = (wwhlp ? chlh : 0);
-
-           form.rcArea.top = ((wmbp || wtbp) ? 0 : fibw) + wtel * wflh + whlh;
-         }
-#else
          form.rcArea.top = (WINDOW_TOP_EDGE_Y (w)
                             + WINDOW_HEADER_LINE_HEIGHT (w));
-#endif
          form.rcArea.right = (WINDOW_BOX_RIGHT_EDGE_X (w)
                               - WINDOW_RIGHT_MARGIN_WIDTH (w)
                               - WINDOW_RIGHT_FRINGE_WIDTH (w));