mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 19:07:52 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
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 (concat
(format "\\fB%s\\fP " org-clock-string) (format "\\fB%s\\fP " org-clock-string)
(format org-groff-inactive-timestamp-format (format org-groff-inactive-timestamp-format
(concat (org-translate-time (concat (org-timestamp-translate (org-element-property :value clock))
(org-element-property :raw-value
(org-element-property :value clock)))
(let ((time (org-element-property :duration clock))) (let ((time (org-element-property :duration clock)))
(and time (format " (%s)" time))))))) (and time (format " (%s)" time)))))))
@ -1409,22 +1407,19 @@ information."
(concat (concat
(format "\\fR %s \\fP" org-closed-string) (format "\\fR %s \\fP" org-closed-string)
(format org-groff-inactive-timestamp-format (format org-groff-inactive-timestamp-format
(org-translate-time (org-timestamp-translate closed)))))
(org-element-property :raw-value closed))))))
(let ((deadline (org-element-property :deadline planning))) (let ((deadline (org-element-property :deadline planning)))
(when deadline (when deadline
(concat (concat
(format "\\fB %s \\fP" org-deadline-string) (format "\\fB %s \\fP" org-deadline-string)
(format org-groff-active-timestamp-format (format org-groff-active-timestamp-format
(org-translate-time (org-timestamp-translate deadline)))))
(org-element-property :raw-value deadline))))))
(let ((scheduled (org-element-property :scheduled planning))) (let ((scheduled (org-element-property :scheduled planning)))
(when scheduled (when scheduled
(concat (concat
(format "\\fR %s \\fP" org-scheduled-string) (format "\\fR %s \\fP" org-scheduled-string)
(format org-groff-active-timestamp-format (format org-groff-active-timestamp-format
(org-translate-time (org-timestamp-translate scheduled)))))))
(org-element-property :raw-value scheduled))))))))
"") "")
"")) ""))