diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-05 11:48:59 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-05 11:50:31 -0800 |
| commit | 088bfcc2d80eed44864147f3491eff69e4eb5cd8 (patch) | |
| tree | a57599fb3064d09c38eec4ddd9cded8a3df72e6c /lisp/org | |
| parent | 448df8fec7a7fb3fe558749591e657e8a84cb46b (diff) | |
| download | emacs-088bfcc2d80eed44864147f3491eff69e4eb5cd8.tar.gz | |
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.
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-agenda.el | 1 | ||||
| -rw-r--r-- | lisp/org/ox-odt.el | 2 |
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")) |