diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-10-27 09:39:12 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-10-27 09:39:12 +0200 |
| commit | 7221b88f6d4145d007ecc229d220e5e99709c33b (patch) | |
| tree | fa1bdc5189daa44f3de304d380bb33ead8962f72 | |
| parent | b0eeb260ef8a6dafab4d548a254e15d8e5e07863 (diff) | |
| parent | dda453eb7e4c7d67c22f1dd0dba3302b8db391cb (diff) | |
| download | org-mode-7221b88f6d4145d007ecc229d220e5e99709c33b.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el index 4e79125..2aa70bd 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -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)))) |