Merge branch 'maint'
This commit is contained in:
commit
fd6a6b5cb4
|
@ -6105,9 +6105,10 @@ by a #."
|
||||||
'keymap org-mouse-map))
|
'keymap org-mouse-map))
|
||||||
(org-rear-nonsticky-at (match-end 0))
|
(org-rear-nonsticky-at (match-end 0))
|
||||||
(when org-display-custom-times
|
(when org-display-custom-times
|
||||||
(if (match-end 3)
|
;; If it's a date range, activate custom time for second date.
|
||||||
(org-display-custom-time (match-beginning 3) (match-end 3))
|
(when (match-end 3)
|
||||||
(org-display-custom-time (match-beginning 1) (match-end 1))))
|
(org-display-custom-time (match-beginning 3) (match-end 3)))
|
||||||
|
(org-display-custom-time (match-beginning 1) (match-end 1)))
|
||||||
t))
|
t))
|
||||||
|
|
||||||
(defvar-local org-target-link-regexp nil
|
(defvar-local org-target-link-regexp nil
|
||||||
|
|
Loading…
Reference in New Issue