aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-06-29 21:52:54 +0300
committerEli Zaretskii2012-06-29 21:52:54 +0300
commit2e5a663126a0260f5a8bb9d12b8c02c3745ea94b (patch)
tree4c3dd73d41c7eea0c8bfe3c37d068a812aef7b90 /src
parent8d38f4616b85a226221e599c34e55298bb54d3cc (diff)
downloademacs-2e5a663126a0260f5a8bb9d12b8c02c3745ea94b.tar.gz
emacs-2e5a663126a0260f5a8bb9d12b8c02c3745ea94b.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xdisp.c4
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 @@
12012-06-29 Eli Zaretskii <eliz@gnu.org> 12012-06-29 Eli Zaretskii <eliz@gnu.org>
2 2
3 * xdisp.c (try_window_id): Undo last change.
4
3 * w32.c (getwd): Adjust commentary about startup_dir. 5 * w32.c (getwd): Adjust commentary about startup_dir.
4 (init_environment): Always call sys_access, even in non-MSVC 6 (init_environment): Always call sys_access, even in non-MSVC
5 builds. Don't chdir to the directory of the Emacs executable. 7 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)
17761 { 17761 {
17762 /* Displayed to end of window, but no line containing text was 17762 /* Displayed to end of window, but no line containing text was
17763 displayed. Lines were deleted at the end of the window. */ 17763 displayed. Lines were deleted at the end of the window. */
17764 ptrdiff_t first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0; 17764 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0;
17765 ptrdiff_t vpos = XFASTINT (w->window_end_vpos); 17765 int vpos = XFASTINT (w->window_end_vpos);
17766 struct glyph_row *current_row = current_matrix->rows + vpos; 17766 struct glyph_row *current_row = current_matrix->rows + vpos;
17767 struct glyph_row *desired_row = desired_matrix->rows + vpos; 17767 struct glyph_row *desired_row = desired_matrix->rows + vpos;
17768 17768