summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-07-28 19:33:24 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2013-07-28 19:33:24 (GMT)
commit9b7f43768fee48dcebcd75827b9dc9ea2bd7e9cb (patch)
treea20770616543d6590f9e292c9fff60d6570e49e9
parentaef1b177737238d9df6991d28dc5ff36934de72d (diff)
parent17ba41434e451aeb3d0e9efdad65b3d21f9467d9 (diff)
downloadorg-mode-9b7f43768fee48dcebcd75827b9dc9ea2bd7e9cb.zip
org-mode-9b7f43768fee48dcebcd75827b9dc9ea2bd7e9cb.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ox.el b/lisp/ox.el
index b733d3e..b340b96 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6070,11 +6070,11 @@ options as CDR."
(memq key '(14 16 ?\s ?\d)))
(case key
(14 (if (not (pos-visible-in-window-p (point-max)))
- (ignore-errors (scroll-up-line))
+ (ignore-errors (scroll-up 1))
(message "End of buffer")
(sit-for 1)))
(16 (if (not (pos-visible-in-window-p (point-min)))
- (ignore-errors (scroll-down-line))
+ (ignore-errors (scroll-down 1))
(message "Beginning of buffer")
(sit-for 1)))
(?\s (if (not (pos-visible-in-window-p (point-max)))