[Emacs-diffs] /srv/bzr/emacs/trunk r108803: Undo change in xdisp.c in revision 108801.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108803
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-06-29 21:52:54 +0300
message:
  Undo change in xdisp.c in revision 108801.
  
   src/xdisp.c (try_window_id): Undo last change.  'int' is wide 
   enough to hold vertical pixel positions on screen.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-29 13:11:54 +0000
+++ b/src/ChangeLog     2012-06-29 18:52:54 +0000
@@ -1,5 +1,7 @@
 2012-06-29  Eli Zaretskii  <address@hidden>
 
+       * 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.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-06-29 11:48:08 +0000
+++ b/src/xdisp.c       2012-06-29 18:52:54 +0000
@@ -17761,8 +17761,8 @@
     {
       /* 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;