aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref/windows.texi
diff options
context:
space:
mode:
authorGlenn Morris2013-01-06 12:34:54 -0800
committerGlenn Morris2013-01-06 12:34:54 -0800
commitd0cfb71f2e0a5a4cd231b3139f013a1908bfaefa (patch)
treece048607947e2a4048adb26c441be229424be545 /doc/lispref/windows.texi
parentb6cfbcd0fcd40fd41112477b62f1d819ee3d2998 (diff)
parent605f02eea950716821f474ea60f7b78b9962665e (diff)
downloademacs-d0cfb71f2e0a5a4cd231b3139f013a1908bfaefa.tar.gz
emacs-d0cfb71f2e0a5a4cd231b3139f013a1908bfaefa.zip
Merge from emacs-24; up to 2012-12-07T15:31:43Z!cyd@gnu.org
Diffstat (limited to 'doc/lispref/windows.texi')
-rw-r--r--doc/lispref/windows.texi9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index b3c143496dd..792002add81 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3054,10 +3054,11 @@ pixels. In this case, the return value is @var{lines}.
3054@end defun 3054@end defun
3055 3055
3056@defvar auto-window-vscroll 3056@defvar auto-window-vscroll
3057If this variable is non-@code{nil}, the line-move, scroll-up, and 3057If this variable is non-@code{nil}, the @code{line-move},
3058scroll-down functions will automatically modify the vertical scroll 3058@code{scroll-up}, and @code{scroll-down} functions will automatically
3059position to scroll through display rows that are taller than the height 3059modify the vertical scroll position to scroll through display rows
3060of the window, for example in the presence of large images. 3060that are taller than the height of the window, for example in the
3061presence of large images.
3061@end defvar 3062@end defvar
3062 3063
3063@node Horizontal Scrolling 3064@node Horizontal Scrolling