[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113532: Fix bug #14780 with unreachable lines near
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r113532: Fix bug #14780 with unreachable lines near end of buffer. |
Date: |
Wed, 24 Jul 2013 17:37:37 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113532
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14780
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-07-24 20:36:42 +0300
message:
Fix bug #14780 with unreachable lines near end of buffer.
src/xdisp.c (redisplay_window): Instead of moving point out of
scroll margin, reject the force_start method, and try scrolling.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-07-24 15:11:30 +0000
+++ b/src/ChangeLog 2013-07-24 17:36:42 +0000
@@ -1,3 +1,9 @@
+2013-07-24 Eli Zaretskii <address@hidden>
+
+ * xdisp.c (redisplay_window): Instead of moving point out of
+ scroll margin, reject the force_start method, and try scrolling
+ instead. (Bug#14780)
+
2013-07-24 Ken Brown <address@hidden>
* alloc.c (make_save_ptr): Define if HAVE_NTGUI is defined
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2013-07-16 21:35:45 +0000
+++ b/src/xdisp.c 2013-07-24 17:36:42 +0000
@@ -15608,10 +15608,11 @@
the Y coordinate of the _next_ row, see the definition of
MATRIX_ROW_BOTTOM_Y. */
if (w->cursor.vpos < margin + header_line)
- new_vpos
- = pixel_margin + (header_line
- ? CURRENT_HEADER_LINE_HEIGHT (w)
- : 0) + frame_line_height;
+ {
+ w->cursor.vpos = -1;
+ clear_glyph_matrix (w->desired_matrix);
+ goto try_to_scroll;
+ }
else
{
int window_height = window_box_height (w);
@@ -15619,7 +15620,11 @@
if (header_line)
window_height += CURRENT_HEADER_LINE_HEIGHT (w);
if (w->cursor.y >= window_height - pixel_margin)
- new_vpos = window_height - pixel_margin;
+ {
+ w->cursor.vpos = -1;
+ clear_glyph_matrix (w->desired_matrix);
+ goto try_to_scroll;
+ }
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113532: Fix bug #14780 with unreachable lines near end of buffer.,
Eli Zaretskii <=