aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/cus-start.el6
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8611edd3bfc..19968c46aa8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-01-10 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * cus-start.el (toplevel): Only allow float values for
4 scroll-up-aggressively and scroll-down-aggressively.
5 Allow any number for line-spacing.
6
12013-01-10 Stefan Monnier <monnier@iro.umontreal.ca> 72013-01-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * doc-view.el (doc-view-pdfdraw-program): Allow "pdfdraw" name. 9 * doc-view.el (doc-view-pdfdraw-program): Allow "pdfdraw" name.
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 9d2c2750987..b954ed60baa 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -115,12 +115,12 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
115 (const :tag "On the right" (down . right)))) 115 (const :tag "On the right" (down . right))))
116 (other :tag "On left, no arrows" t))) 116 (other :tag "On left, no arrows" t)))
117 (scroll-up-aggressively windows 117 (scroll-up-aggressively windows
118 (choice (const :tag "off" nil) number) 118 (choice (const :tag "off" nil) float)
119 "21.1") 119 "21.1")
120 (scroll-down-aggressively windows 120 (scroll-down-aggressively windows
121 (choice (const :tag "off" nil) number) 121 (choice (const :tag "off" nil) float)
122 "21.1") 122 "21.1")
123 (line-spacing display (choice (const :tag "none" nil) integer) 123 (line-spacing display (choice (const :tag "none" nil) number)
124 "22.1") 124 "22.1")
125 (cursor-in-non-selected-windows 125 (cursor-in-non-selected-windows
126 cursor boolean nil 126 cursor boolean nil