Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-03-18 16:25:55 +01:00
commit 040ec48a0d
1 changed files with 1 additions and 1 deletions

View File

@ -15565,7 +15565,7 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead."
(widen)
(catch 'ex
(while t
(when (setq tmp (org-entry-get nil property nil 'literal-nil))
(when (setq tmp (org-entry-get nil property nil literal-nil))
(or (ignore-errors (org-back-to-heading t))
(goto-char (point-min)))
(move-marker org-entry-property-inherited-from (point))