mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-03-16 13:08:12 +01:00
parent f2e5920f41 175543e5ef
commit a2fd3bc91b
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/lisp/ox-groff.el
View File

@ -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)))))))
"")
""))