Merge branch 'maint'

Conflicts:
	lisp/org-element.el
This commit is contained in:
Nicolas Goaziou 2014-07-31 12:19:40 +02:00
commit 5ec0468e0a
1 changed files with 1 additions and 1 deletions

View File

@ -777,7 +777,7 @@ containing `:raw-value', `:title', `:alt-title', `:begin',
`:end', `:pre-blank', `:contents-begin' and `:contents-end',
`:level', `:priority', `:tags', `:todo-keyword',`:todo-type',
`:scheduled', `:deadline', `:closed', `:archivedp', `:commentedp'
and `:footnote-section-p' keywords.
`:footnote-section-p' and `:post-blank' keywords.
The plist also contains any property set in the property drawer,
with its name in upper cases and colons added at the