Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2019-01-12 11:50:37 +01:00
commit 871119986a
1 changed files with 5 additions and 1 deletions

View File

@ -10054,7 +10054,7 @@ a link."
(org-element-context) (org-element-context)
'(clock comment comment-block footnote-definition '(clock comment comment-block footnote-definition
footnote-reference headline inline-src-block inlinetask footnote-reference headline inline-src-block inlinetask
keyword link node-property src-block timestamp) keyword link node-property planning src-block timestamp)
t)) t))
(type (org-element-type context)) (type (org-element-type context))
(value (org-element-property :value context))) (value (org-element-property :value context)))
@ -10097,6 +10097,10 @@ a link."
(= (org-element-property :post-affiliated context) (= (org-element-property :post-affiliated context)
(line-beginning-position))))))) (line-beginning-position)))))))
(org-footnote-action)) (org-footnote-action))
;; On a planning line. Check if we are really on a timestamp.
((and (eq type 'planning)
(org-in-regexp org-ts-regexp-both nil t))
(org-follow-timestamp-link))
;; On a clock line, make sure point is on the timestamp ;; On a clock line, make sure point is on the timestamp
;; before opening it. ;; before opening it.
((and (eq type 'clock) ((and (eq type 'clock)