summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-03-16 13:08:12 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-03-16 13:08:12 +0100
commita2fd3bc91b7c54f020611181bdd980d63ca40649 (patch)
tree57be25009a25a435685ac4edaaa939ccecce92ed
parentf2e5920f4107e47b297b0c34c64369ccd9cc026f (diff)
parent175543e5efe3787df3fed8683e6d749dcc0f16c4 (diff)
downloadorg-mode-a2fd3bc91b7c54f020611181bdd980d63ca40649.tar.gz
Merge branch 'maint'
-rw-r--r--contrib/lisp/ox-groff.el13
1 files changed, 4 insertions, 9 deletions
diff --git a/contrib/lisp/ox-groff.el b/contrib/lisp/ox-groff.el
index a9478b9..555a89d 100644
--- a/contrib/lisp/ox-groff.el
+++ b/contrib/lisp/ox-groff.el
@@ -823,9 +823,7 @@ information."
(concat
(format "\\fB%s\\fP " org-clock-string)
(format org-groff-inactive-timestamp-format
- (concat (org-translate-time
- (org-element-property :raw-value
- (org-element-property :value clock)))
+ (concat (org-timestamp-translate (org-element-property :value clock))
(let ((time (org-element-property :duration clock)))
(and time (format " (%s)" time)))))))
@@ -1409,22 +1407,19 @@ information."
(concat
(format "\\fR %s \\fP" org-closed-string)
(format org-groff-inactive-timestamp-format
- (org-translate-time
- (org-element-property :raw-value closed))))))
+ (org-timestamp-translate closed)))))
(let ((deadline (org-element-property :deadline planning)))
(when deadline
(concat
(format "\\fB %s \\fP" org-deadline-string)
(format org-groff-active-timestamp-format
- (org-translate-time
- (org-element-property :raw-value deadline))))))
+ (org-timestamp-translate deadline)))))
(let ((scheduled (org-element-property :scheduled planning)))
(when scheduled
(concat
(format "\\fR %s \\fP" org-scheduled-string)
(format org-groff-active-timestamp-format
- (org-translate-time
- (org-element-property :raw-value scheduled))))))))
+ (org-timestamp-translate scheduled)))))))
"")
""))