diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a75ed5cbc37..4f3c229481e 100644 --- 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 0b1012990d3..ae06355ac60 100644 --- 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; |