From: Kyle Meyer <kyle@kyleam.com>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: Org-mode <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] org-clock: Fix CLOCK_INTO_DRAWER property check
Date: Thu, 16 Oct 2014 16:51:56 -0400 [thread overview]
Message-ID: <87siin91qr.fsf@kmlap.domain.org> (raw)
In-Reply-To: <87wq7z92bp.fsf@kmlap.domain.org> (Kyle Meyer's message of "Thu, 16 Oct 2014 16:39:22 -0400")
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
Kyle Meyer <kyle@kyleam.com> wrote:
> Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:
>> This is wrong.
>>
>> If p is a string, e.g. "FOO", return value should be "FOO". Ditto if
>> q contains a string.
>
> Right. Thanks for pointing that out. I'll update the patch.
This new patch should handle that correctly.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-clock-Fix-CLOCK_INTO_DRAWER-property-check.patch --]
[-- Type: text/x-diff, Size: 1927 bytes --]
From 84799f9b9f4a2e89b3e717194352ef9a9d082de3 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
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
next prev parent reply other threads:[~2014-10-16 20:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-16 19:34 [PATCH] org-clock: Fix CLOCK_INTO_DRAWER property check Kyle Meyer
2014-10-16 20:25 ` Nicolas Goaziou
2014-10-16 20:39 ` Kyle Meyer
2014-10-16 20:51 ` Kyle Meyer [this message]
2014-10-16 21:01 ` Nicolas Goaziou
2014-10-16 21:20 ` Kyle Meyer
2014-10-16 22:21 ` Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87siin91qr.fsf@kmlap.domain.org \
--to=kyle@kyleam.com \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).