From: Kim F. Storm <storm@cua.dk>
Date: Tue, 15 Jun 2004 10:33:15 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~5755
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4a5739cd32849a02d0d0524d7634fa505b30cf2;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 75fbd62670a..96289d650a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2004-06-15  Kim F. Storm  <storm@cua.dk>
 
+	* xdisp.c (try_cursor_movement): Exclude header line from scroll
+	margin at top of window.
+	(try_window_reusing_current_matrix): Calculate proper cursor position
+	after scrolling up with non-zero scroll margin, as the old cursor
+	position corresponds to value of PT before executing this command.
+	(try_window_id): Consider scroll margin at bottom of window too;
+	otherwise we fail to scroll when hl-line-mode is enabled.
+
 	* syntax.c (skip_chars): Only recognize [:class:] when it has the
 	proper format and class is a lower-case word.