Merge branch 'master' into next

This commit is contained in:
Nicolas Goaziou 2018-10-13 16:54:39 +02:00
commit 36c7bada28
1 changed files with 1 additions and 1 deletions

View File

@ -2687,7 +2687,7 @@ When non-nil, you first need to check off all check boxes before the TODO
entry can be switched to DONE. entry can be switched to DONE.
This variable needs to be set before org.el is loaded, and you need to This variable needs to be set before org.el is loaded, and you need to
restart Emacs after a change to make the change effective. The only way restart Emacs after a change to make the change effective. The only way
to change is while Emacs is running is through the customize interface." to change it while Emacs is running is through the customize interface."
:set (lambda (var val) :set (lambda (var val)
(set var val) (set var val)
(if val (if val