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

This commit is contained in:
Bastien Guerry 2014-09-01 05:09:41 +02:00
commit 5ac96a4503
1 changed files with 3 additions and 3 deletions

View File

@ -5236,10 +5236,10 @@ the process stopped before finding the expected result."
;; buffer. ;; buffer.
((not cached) ((not cached)
(when (org-with-limited-levels (outline-previous-heading)) (when (org-with-limited-levels (outline-previous-heading))
(forward-line)) (setq mode 'planning)
(forward-line))
(skip-chars-forward " \r\t\n") (skip-chars-forward " \r\t\n")
(beginning-of-line) (beginning-of-line))
(setq mode 'planning))
;; Cache returned exact match: return it. ;; Cache returned exact match: return it.
((= pos begin) ((= pos begin)
(throw 'exit (if syncp (org-element-property :parent cached) cached))) (throw 'exit (if syncp (org-element-property :parent cached) cached)))