>From 84799f9b9f4a2e89b3e717194352ef9a9d082de3 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Thu, 16 Oct 2014 15:17:00 -0400 Subject: [PATCH] org-clock: Fix CLOCK_INTO_DRAWER property check * lisp/org-clock.el (org-clock-into-drawer): Fix processing of properties so that they can override global value. Previously, if the 'CLOCK_INTO_DRAWER' or 'LOG_INTO_DRAWER' property was nil, the local property setting would not override the global variable [1]. These changes make the behavior match the docstring description ('CLOCK_INTO_DRAWER' and 'LOG_INTO_DRAWER' properties override `org-clock-into-drawer', with 'CLOCK_INTO_DRAWER' given precedence). [1] http://stackoverflow.com/questions/26405415/how-to-locally-unset-org-clock-into-drawer-t TINYCHANGE --- lisp/org-clock.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 2ffcbfa..fbcda49 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -74,13 +74,15 @@ (defun org-clock-into-drawer () it will be used instead of the default value. The default is the value of the customizable variable `org-clock-into-drawer', which see." - (let ((p (org-entry-get nil "CLOCK_INTO_DRAWER" 'inherit)) - (q (org-entry-get nil "LOG_INTO_DRAWER" 'inherit))) + (let ((p (org-entry-get nil "CLOCK_INTO_DRAWER" 'inherit t)) + (q (org-entry-get nil "LOG_INTO_DRAWER" 'inherit t))) (cond - ((or (not (or p q)) (equal p "nil") (equal q "nil")) org-clock-into-drawer) - ((or (equal p "t") (equal q "t")) "LOGBOOK") - ((not p) q) - (t p)))) + ((not (or p q)) org-clock-into-drawer) + ((equal p "nil") nil) + ((equal p "t") "LOGBOOK") + ((equal q "nil") nil) + ((equal q "t") "LOGBOOK") + (t (or p q))))) (defcustom org-clock-out-when-done t "When non-nil, clock will be stopped when the clocked entry is marked DONE. -- 2.1.2