tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-10-27 09:39:12 +02:00
parent b0eeb260ef dda453eb7e
commit 7221b88f6d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org.el
View File

@ -2519,9 +2519,10 @@ a subtree."
"Return the value of `org-log-into-drawer', but let properties overrule.
If the current entry has or inherits a LOG_INTO_DRAWER property, it will be
used instead of the default value."
(let ((p (org-entry-get nil "LOG_INTO_DRAWER" 'inherit)))
(let ((p (org-entry-get nil "LOG_INTO_DRAWER" 'inherit t)))
(cond
((or (not p) (equal p "nil")) org-log-into-drawer)
((not p) org-log-into-drawer)
((equal p "nil") nil)
((equal p "t") "LOGBOOK")
(t p))))