From: Kyle Meyer <email@example.com> To: Richard Lawrence <firstname.lastname@example.org> Cc: email@example.com Subject: [PATCH] capture: Fix handling of time range for :time-prompt Date: Mon, 18 Jan 2021 21:25:27 -0500 [thread overview] Message-ID: <firstname.lastname@example.org> (raw) In-Reply-To: <email@example.com> Kyle Meyer writes: > I'm okay with the minimal fix to the regexp, though I wonder if we can > avoid the follow-up call to org-read-date-analyze entirely. I'm running > out of time to test thoroughly tonight, but perhaps something like this > (ignoring the potential cond->if cleanup): Testing that against the cases in your initial report, I believe it leads to the same results as your patch, so here's a cleaned-up version. -- >8 -- Subject: [PATCH] capture: Fix handling of time range for :time-prompt * lisp/org-capture.el (org-capture-set-target-location): Bind org-end-time-was-given around the org-read-date call to get a return value that uses the start time rather than doing custom adjustment of the return value. If org-capture-set-target-location detects that the answer to org-read-date has a time range, it strips the end time from the answer and calls org-read-date-analyze again. (org-read-date already calls it underneath.) The regexp it uses, however, can easily match a date, leading to a bogus result. org-read-date-analyze is already capable of processing the time range in a way that matches org-capture-set-target-location's intent: when org-end-time-was-given is bound, org-read-date-analyze splits off the end value of the range and stores it in org-end-time-was-given. Drop the custom logic and let org-read-date-analyze handle the range. Reported-by: Richard Lawrence <firstname.lastname@example.org> Ref: https://orgmode.org/list/87h7obh4ct.fsf@aquinas --- lisp/org-capture.el | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index f40f2b335..d7b69f228 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1025,28 +1025,23 @@ (defun org-capture-set-target-location (&optional target) (time-to-days org-overriding-default-time)) ((or (org-capture-get :time-prompt) (equal current-prefix-arg 1)) - ;; Prompt for date. - (let ((prompt-time (org-read-date - nil t nil "Date for tree entry:"))) + ;; Prompt for date. Bind `org-end-time-was-given' so + ;; that `org-read-date-analyze' handles the time range + ;; case and returns `prompt-time' with the start value. + (let* ((org-time-was-given nil) + (org-end-time-was-given nil) + (prompt-time (org-read-date + nil t nil "Date for tree entry:"))) (org-capture-put :default-time - (cond ((and (or (not (boundp 'org-time-was-given)) - (not org-time-was-given)) - (not (= (time-to-days prompt-time) (org-today)))) - ;; Use 00:00 when no time is given for another - ;; date than today? - (apply #'encode-time 0 0 - org-extend-today-until - (cl-cdddr (decode-time prompt-time)))) - ((string-match "\\([^ ]+\\)-[^ ]+[ ]+\\(.*\\)" - org-read-date-final-answer) - ;; Replace any time range by its start. - (apply #'encode-time - (org-read-date-analyze - (replace-match "\\1 \\2" nil nil - org-read-date-final-answer) - prompt-time (decode-time prompt-time)))) - (t prompt-time))) + (if (and (or (not org-time-was-given)) + (not (= (time-to-days prompt-time) (org-today)))) + ;; Use 00:00 when no time is given for another + ;; date than today? + (apply #'encode-time 0 0 + org-extend-today-until + (cl-cdddr (decode-time prompt-time))) + prompt-time)) (time-to-days prompt-time))) (t ;; Current date, possibly corrected for late night base-commit: 9e8215f4a5df7d03ac787da78d28f69a4c18e7d3 -- 2.29.2
next prev parent reply other threads:[~2021-01-19 2:26 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-24 10:42 Bug: incorrect timestamps with :time-prompt and datetrees Richard Lawrence 2020-12-24 12:07 ` Richard Lawrence 2021-01-06 12:16 ` Richard Lawrence 2021-01-12 8:41 ` [PATCH] " Richard Lawrence 2021-01-18 6:35 ` Bug: " Kyle Meyer 2021-01-19 2:25 ` Kyle Meyer [this message] 2021-01-31 11:15 ` [PATCH] capture: Fix handling of time range for :time-prompt Richard Lawrence 2021-02-02 4:42 ` Kyle Meyer 2021-02-02 16:59 ` Richard Lawrence
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 \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --subject='Re: [PATCH] capture: Fix handling of time range for :time-prompt' \ /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
Code repositories for project(s) associated with this 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).