Undo change in xdisp.c in 2012-06-29T11:48:08Z!dmantipov@yandex.ru.

 src/xdisp.c (try_window_id): Undo last change.  'int' is wide
 enough to hold vertical pixel positions on screen.

diff --git a/src/ChangeLog b/src/ChangeLog
index a75ed5c..4f3c229 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-06-29  Eli Zaretskii  <eliz@gnu.org>
 
+       * xdisp.c (try_window_id): Undo last change.
+
        * w32.c (getwd): Adjust commentary about startup_dir.
        (init_environment): Always call sys_access, even in non-MSVC
        builds.  Don't chdir to the directory of the Emacs executable.

diff --git a/src/xdisp.c b/src/xdisp.c
index 0b10129..ae06355 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17761,8 +17761,8 @@ try_window_id (struct window *w)
     {
       /* Displayed to end of window, but no line containing text was
         displayed.  Lines were deleted at the end of the window.  */
-      ptrdiff_t first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0;
-      ptrdiff_t vpos = XFASTINT (w->window_end_vpos);
+      int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0;
+      int vpos = XFASTINT (w->window_end_vpos);
       struct glyph_row *current_row = current_matrix->rows + vpos;
       struct glyph_row *desired_row = desired_matrix->rows + vpos;