From c8d00f77135022b239e251b9ddde4a4bbffcf110 Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Sun, 14 Dec 2014 17:31:49 +0800
Subject: [PATCH 1/4] Ensure org-log-into-drawer returns nil or string

* lisp/org.el (org-log-into-drawer): Don't let it simply return t.
---
 lisp/org.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 4aa7988..6df6e2e 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2969,7 +2969,11 @@ 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 t)))
     (cond
-     ((not p) org-log-into-drawer)
+     ((not p)
+      (when log-into-drawer
+	(if (stringp org-log-into-drawer)
+	    org-log-into-drawer
+	  "LOGBOOK")))
      ((equal p "nil") nil)
      ((equal p "t") "LOGBOOK")
      (t p))))
-- 
2.1.3