Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2011-03-01 13:07:28 +01:00
commit 511fb10eb1
1 changed files with 67 additions and 66 deletions

View File

@ -516,18 +516,19 @@ are boundaries and CONTEXT is a symbol among `drawer', `block',
Contexts `block' and `invalid' refer to `org-list-forbidden-blocks'." Contexts `block' and `invalid' refer to `org-list-forbidden-blocks'."
(save-match-data (save-match-data
(org-with-limited-levels (save-excursion
(beginning-of-line) (beginning-of-line)
(let* ((case-fold-search t) (pos (point)) beg end (let* ((case-fold-search t) (pos (point)) beg end
;; Compute position of surrounding headings. This is the ;; Compute position of surrounding headings. This is the
;; default context. ;; default context.
(heading (heading
(org-with-limited-levels
(save-excursion (save-excursion
(list (or (and (org-at-heading-p) (point-at-bol)) (list (or (and (org-at-heading-p) (point-at-bol))
(outline-previous-heading) (outline-previous-heading)
(point-min)) (point-min))
(or (outline-next-heading) (point-max)) (or (outline-next-heading) (point-max))
nil))) nil))))
(prev-head (car heading)) (prev-head (car heading))
(next-head (nth 1 heading)) (next-head (nth 1 heading))
;; Is point inside a drawer? ;; Is point inside a drawer?