diff options
author | Bastien Guerry <bzg@altern.org> | 2013-02-15 19:52:35 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-02-15 19:52:35 +0100 |
commit | a2fac38d56c28ebcbc71a4b606e57b8f36042078 (patch) | |
tree | 20890553c240f2cdaeec6181c0c812a93124706d | |
parent | 006bbe6e62907e5b9a25cd99d11812a6d52e1c82 (diff) | |
parent | 68ab722a499995e1b18a60e9851e57f6fe7fbe8e (diff) | |
download | org-mode-a2fac38d56c28ebcbc71a4b606e57b8f36042078.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/ox.el | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -3715,10 +3715,7 @@ significant." (when foundp (throw 'exit foundp))))) (org-export-get-genealogy link)) nil) ;; No match with a common ancestor: try full parse-tree. - (funcall find-headline - (if (not match-title-p) path - (cons (substring (car path) 1) (cdr path))) - (plist-get info :parse-tree)))))))) + (funcall find-headline path (plist-get info :parse-tree)))))))) (defun org-export-resolve-id-link (link info) "Return headline referenced as LINK destination. @@ -5512,8 +5509,14 @@ options as CDR." (not expertp) (memq key '(? ? ?\s ?\d))) (case key - (? (ignore-errors (scroll-up-line))) - (? (ignore-errors (scroll-down-line))) + (? (if (not (pos-visible-in-window-p (point-max))) + (ignore-errors (scroll-up-line)) + (message "End of buffer") + (sit-for 1))) + (? (if (not (pos-visible-in-window-p (point-min))) + (ignore-errors (scroll-down-line)) + (message "Beginning of buffer") + (sit-for 1))) (?\s (if (not (pos-visible-in-window-p (point-max))) (scroll-up nil) (message "End of buffer") |