Move “Fix some broken conditional forms” to master

Revert 2020-01-04T19:17:12Z!eggert@cs.ucla.edu
which recently I installed into the emacs-27 branch by mistake.
These patches are now on master instead (via merging).
Do not merge to master.

2 files changed, 2 insertions, 1 deletions

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index f45e47fb59a..4f89ea54500 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -8981,6 +8981,7 @@ fold drawers."
          (narrow-to-region (org-entry-beginning-position)
                            (org-entry-end-position))
          (org-show-all '(drawers))))
+      (when arg )
       (setq org-agenda-show-window (selected-window)))
     (select-window win)))
 
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index a1486318a7d..51cb42a49a5 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -940,7 +940,7 @@ See `org-odt--build-date-styles' for implementation details."
          (has-time-p (or (not timestamp)
                          (org-timestamp-has-time-p timestamp)))
          (iso-date (let ((format (if has-time-p "%Y-%m-%dT%H:%M:%S"
-                                   "%Y-%m-%d")))
+                                   "%Y-%m-%dT%H:%M:%S")))
                      (funcall format-timestamp timestamp format end))))
     (if iso-date-p iso-date
       (let* ((style (if has-time-p "OrgDate2" "OrgDate1"))