[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105541: Fix bug #8874 with recenteri
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105541: Fix bug #8874 with recentering and header line under scroll-conservatively. |
Date: |
Tue, 23 Aug 2011 13:35:47 +0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105541
fixes bug(s): http://debbugs.gnu.org/8874
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2011-08-23 13:35:47 +0300
message:
Fix bug #8874 with recentering and header line under scroll-conservatively.
src/xdisp.c (redisplay_window): When computing centering_position,
account for the height of the header line.
modified:
src/ChangeLog
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-08-23 08:38:29 +0000
+++ b/src/ChangeLog 2011-08-23 10:35:47 +0000
@@ -1,5 +1,8 @@
2011-08-23 Eli Zaretskii <address@hidden>
+ * xdisp.c (redisplay_window): When computing centering_position,
+ account for the height of the header line. (Bug#8874)
+
* dispnew.c (buffer_posn_from_coords): Use buf_charpos_to_bytepos
instead of CHAR_TO_BYTE. Fixes a crash when a completion
candidate is selected by the mouse, and that candidate has a
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2011-08-23 07:01:25 +0000
+++ b/src/xdisp.c 2011-08-23 10:35:47 +0000
@@ -15244,7 +15244,8 @@
if (pt_offset)
centering_position -= pt_offset;
centering_position -=
- FRAME_LINE_HEIGHT (f) * (1 + margin + (last_line_misfit != 0));
+ FRAME_LINE_HEIGHT (f) * (1 + margin + (last_line_misfit != 0))
+ + WINDOW_HEADER_LINE_HEIGHT (w);
/* Don't let point enter the scroll margin near top of
the window. */
if (centering_position < margin * FRAME_LINE_HEIGHT (f))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105541: Fix bug #8874 with recentering and header line under scroll-conservatively.,
Eli Zaretskii <=