aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2002-03-05 10:51:31 +0000
committerAndreas Schwab2002-03-05 10:51:31 +0000
commit5d335845144496f831be1dc36f9d9b6a571d5073 (patch)
tree7c935556b9f424ef0ba846c78f03a164982e1294 /src
parent277ec2afd61efbd14b8d896c9cd014a36fb19796 (diff)
downloademacs-5d335845144496f831be1dc36f9d9b6a571d5073.tar.gz
emacs-5d335845144496f831be1dc36f9d9b6a571d5073.zip
(hscroll_margin): Change to EMACS_INT.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e796c9bd2b4..b979d1bb8ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12002-03-05 Andreas Schwab <schwab@suse.de>
2
3 * xdisp.c (hscroll_margin): Change to EMACS_INT.
4
12002-03-05 Per Abrahamsen <abraham@dina.kvl.dk> 52002-03-05 Per Abrahamsen <abraham@dina.kvl.dk>
2 6
3 * frame.c (default-frame-alist): Explain that setting it doesn't 7 * frame.c (default-frame-alist): Explain that setting it doesn't
diff --git a/src/xdisp.c b/src/xdisp.c
index c591e69b7cc..b649cb2f04f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1,5 +1,5 @@
1/* Display generation from window structure and buffer text. 1/* Display generation from window structure and buffer text.
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 99, 2000, 2001 2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 99, 2000, 2001, 2002
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
@@ -584,7 +584,7 @@ int automatic_hscrolling_p;
584 584
585/* How close to the margin can point get before the window is scrolled 585/* How close to the margin can point get before the window is scrolled
586 horizontally. */ 586 horizontally. */
587int hscroll_margin; 587EMACS_INT hscroll_margin;
588 588
589/* How much to scroll horizontally when point is inside the above margin. */ 589/* How much to scroll horizontally when point is inside the above margin. */
590Lisp_Object Vhscroll_step; 590Lisp_Object Vhscroll_step;