diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-08-30 08:12:29 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-08-30 08:12:29 +0200 |
| commit | c01b62305e4bd69a26da9838ce4a86a73f01c92e (patch) | |
| tree | 654d17a8689936085dd4c547645eea77d095ea0c | |
| parent | daf30f180cbe45c3dbb48abff0679d2aba7c1bb8 (diff) | |
| parent | 18a48b5861a6d90e020d4d0b47cb15654e85d7a7 (diff) | |
| download | org-mode-c01b62305e4bd69a26da9838ce4a86a73f01c92e.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org.el | 2 | ||||
| -rw-r--r-- | lisp/ox-odt.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el index 0b6a320..2680cee 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8941,7 +8941,7 @@ function is being called interactively." ;; The clock marker is lost when using `sort-subr'; mark ;; the clock with temporary `:org-clock-marker-backup' ;; text property. - (when (and (eq (org-clocking-buffer) (current-buffer)) + (when (and (eq (org-clock-is-active) (current-buffer)) (<= start (marker-position org-clock-marker)) (>= end (marker-position org-clock-marker))) (org-with-silent-modifications diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index a353902..0c8ae44 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -1871,7 +1871,7 @@ See `org-odt-format-headline-function' for details." (let ((style (if (eq todo-type 'done) "OrgDone" "OrgTodo"))) (format "<text:span text:style-name=\"%s\">%s</text:span> " style todo))) (when priority - (let* ((style (format "OrgPriority-%s" priority)) + (let* ((style (format "OrgPriority-%c" priority)) (priority (format "[#%c]" priority))) (format "<text:span text:style-name=\"%s\">%s</text:span> " style priority))) |