summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-07-06 19:21:48 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-07-06 19:21:48 +0200
commitfd6a6b5cb4d904146b1672eb96a8c4ddd63ce20c (patch)
treed1c2a480acddf1561ef37404070e0a9ba6d732f6
parentc3bc1d2592b4875f1c00a1718521e8ca1d03d83d (diff)
parent1849f391bc75e9e4e7dba9e8587f01532b6d7cdf (diff)
downloadorg-mode-fd6a6b5cb4d904146b1672eb96a8c4ddd63ce20c.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index ab0bde1..e0e3346 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6105,9 +6105,10 @@ by a #."
'keymap org-mouse-map))
(org-rear-nonsticky-at (match-end 0))
(when org-display-custom-times
- (if (match-end 3)
- (org-display-custom-time (match-beginning 3) (match-end 3))
- (org-display-custom-time (match-beginning 1) (match-end 1))))
+ ;; If it's a date range, activate custom time for second date.
+ (when (match-end 3)
+ (org-display-custom-time (match-beginning 3) (match-end 3)))
+ (org-display-custom-time (match-beginning 1) (match-end 1)))
t))
(defvar-local org-target-link-regexp nil