From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kyle Meyer Subject: Re: [PATCH] org-clock: Fix CLOCK_INTO_DRAWER property check Date: Thu, 16 Oct 2014 17:20:21 -0400 Message-ID: <87mw8v90fe.fsf@kmlap.domain.org> References: <87d29rajwv.fsf@kmlap.domain.org> <878ukf3gpl.fsf@nicolasgoaziou.fr> <87wq7z92bp.fsf@kmlap.domain.org> <87siin91qr.fsf@kmlap.domain.org> <874mv33f0v.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XesRK-0005Vl-An for emacs-orgmode@gnu.org; Thu, 16 Oct 2014 17:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XesRF-0006q5-JH for emacs-orgmode@gnu.org; Thu, 16 Oct 2014 17:18:30 -0400 Received: from mail-qa0-f51.google.com ([209.85.216.51]:38746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XesRF-0006q0-F0 for emacs-orgmode@gnu.org; Thu, 16 Oct 2014 17:18:25 -0400 Received: by mail-qa0-f51.google.com with SMTP id k15so2943872qaq.38 for ; Thu, 16 Oct 2014 14:18:25 -0700 (PDT) In-Reply-To: <874mv33f0v.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Thu, 16 Oct 2014 23:01:36 +0200") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Nicolas Goaziou Cc: Org-mode --=-=-= Content-Type: text/plain Nicolas Goaziou wrote: > Kyle Meyer writes: > Actually, it doesn't work either. Under some circumstances (e.g, when > p is a drawer name and q is "t"), q will have precedence over p, which > is not desirable. Good point. > What about this? > > (cond ((equal p "nil") nil) > ((equal p "t") t) > (p) > ((equal q "nil") nil) > ((equal q "t") t) > (q) > (t org-clock-into-drawer)) Nice. Thanks for fixing my fixes. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-org-clock-Fix-CLOCK_INTO_DRAWER-property-check.patch >From ac5c110cab56214d4bdf51b3ba52fc111794758f 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 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 2ffcbfa..092a6aa 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))) - (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)))) + (let ((p (org-entry-get nil "CLOCK_INTO_DRAWER" 'inherit t)) + (q (org-entry-get nil "LOG_INTO_DRAWER" 'inherit t))) + (cond ((equal p "nil") nil) + ((equal p "t") t) + (p) + ((equal q "nil") nil) + ((equal q "t") t) + (q) + (t org-clock-into-drawer)))) (defcustom org-clock-out-when-done t "When non-nil, clock will be stopped when the clocked entry is marked DONE. -- 2.1.2 --=-=-=--