diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-11-26 14:23:01 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-11-26 14:23:01 +0100 |
| commit | e103ad8ae1b1e7effe71b99fd027fc67bf8c43ef (patch) | |
| tree | 30abb73a50fcdad387d232a1d26c5527693aa1db | |
| parent | 12c118b43d66064b2d4d5d13e58ccc55c521cedd (diff) | |
| parent | b0a436cb8e316b266c4d5f3691cc94625a3238b5 (diff) | |
| download | org-mode-e103ad8ae1b1e7effe71b99fd027fc67bf8c43ef.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-agenda.el | 2 | ||||
| -rw-r--r-- | lisp/ox-icalendar.el | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index c93f976..6047a66 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3349,7 +3349,7 @@ the agenda to write." (rename-buffer org-agenda-write-buffer-name t) (set-buffer-modified-p nil) (insert bs) - (org-agenda-remove-marked-text 'org-filtered) + (org-agenda-remove-marked-text 'invisible 'org-filtered) (run-hooks 'org-agenda-before-write-hook) (cond ((org-bound-and-true-p org-mobile-creating-agendas) diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index f459d82..d406f4f 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/ox-icalendar.el @@ -896,7 +896,9 @@ This function assumes major mode for current buffer is (buffer-substring (point) (progn (outline-next-heading) (point))))))))) (forward-line))))) - 'icalendar t '(:ascii-charset utf-8 :ascii-links-to-notes nil)))) + 'icalendar t + '(:ascii-charset utf-8 :ascii-links-to-notes nil + :icalendar-include-todo all)))) (with-temp-file file (insert (org-icalendar--vcalendar |