ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-11-26 14:23:01 +01:00
parent 12c118b43d b0a436cb8e
commit e103ad8ae1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-agenda.el
View File

@ -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)

4
lisp/ox-icalendar.el
View File

@ -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