summaryrefslogtreecommitdiff
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2017-02-02 21:35:51 -0500
committerNoam Postavsky <npostavs@gmail.com>2017-02-02 21:35:51 -0500
commitce88155d83ba84e84321ed69a39c82f40117dd1f (patch)
treeb56e2f89a597cb407747639c02333dde7e4552ba /lisp/cus-start.el
parent604724e49d7b44dc663ad941998a0a44aa4fc178 (diff)
parentda515a0d8e97d89a1c7e60faea190174a8c72618 (diff)
downloademacs-ce88155d83ba84e84321ed69a39c82f40117dd1f.tar.gz
; Merge: fixes and updates to scroll margin (Bug#5718)
- add new option `maximum-sroll-margin' - refactor and fix scroll margin calculation
Diffstat (limited to 'lisp/cus-start.el')
-rw-r--r--lisp/cus-start.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index a790419b86f..51c43c7d21a 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -511,6 +511,7 @@ since it could result in memory overflow and make Emacs crash."
(scroll-step windows integer)
(scroll-conservatively windows integer)
(scroll-margin windows integer)
+ (maximum-scroll-margin windows float "26.1")
(hscroll-margin windows integer "22.1")
(hscroll-step windows number "22.1")
(truncate-partial-width-windows