Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Tim Visher]

On Fri, Jun 23, 2023 at 6:53 AM Ihor Radchenko  wrote:

> Tim Visher  writes:
>
> > I've attached a small follow up `worg` patch to hopefully clarify the
> > changelog section of the commit message going forward for other
> > contributors.
>
> Thanks!
> Applied, onto master, with amendments:
>
> 1. I removed "Note", converting into normal sentence. Note is redundant.
> 2. I added reference to GNU standards, explaining what ChangeLogs are.
> https://git.sr.ht/~bzg/worg/commit/ac865c20


Fantastic! Thanks for all your help, Ihor! TTFN!

Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Ihor Radchenko]

Tim Visher  writes:

> I've attached a small follow up `worg` patch to hopefully clarify the
> changelog section of the commit message going forward for other
> contributors.

Thanks!
Applied, onto master, with amendments:

1. I removed "Note", converting into normal sentence. Note is redundant.
2. I added reference to GNU standards, explaining what ChangeLogs are.
https://git.sr.ht/~bzg/worg/commit/ac865c20

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at .
Support Org development at ,
or support my work at 

Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Tim Visher]

On Thu, Jun 22, 2023 at 6:13 AM Ihor Radchenko  wrote:

> Tim Visher  writes:
>
> > Will do! I've attached a prospective patch file but I'm not sure I follow
> > what you mean by 'add all the necessary changelog entries to the final
> > commit
> > message'. Looking at this commit
> > <
> https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=294a4d2fe21ffcdc1acbbafed1bfc69a1ece7d13
> >
> > I'm guessing that I should have an `* …` entry for every file except
> > `etc/NEWS` that I changed so I've done that but please do let me know if
> > that was the wrong interpretation. :)
>
> Applied, onto main, amending the changelog entries.
> https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=bea9fca18
>
> Should be an entry for every file, including ORG-NEWS, followed by more
> general comments.
>

卵 亂 !!! :)

I've attached a small follow up `worg` patch to hopefully clarify the
changelog section of the commit message going forward for other
contributors.


0001-org-contribute.org-Clarify-files-to-include-in-chang.patch
Description: Binary data

Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Ihor Radchenko]

Tim Visher  writes:

> Will do! I've attached a prospective patch file but I'm not sure I follow
> what you mean by 'add all the necessary changelog entries to the final
> commit
> message'. Looking at this commit
> 
> I'm guessing that I should have an `* …` entry for every file except
> `etc/NEWS` that I changed so I've done that but please do let me know if
> that was the wrong interpretation. :)

Applied, onto main, amending the changelog entries.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=bea9fca18

Should be an entry for every file, including ORG-NEWS, followed by more
general comments.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at .
Support Org development at ,
or support my work at 

Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Tim Visher]

On Wed, Jun 21, 2023 at 11:54 AM Ihor Radchenko  wrote:

> Tim Visher  writes:
>
> >> Also, may you update the docstring of `org-capture-templates'
> >
> >
> > Good catch! This has been done in patch 0004 now. Look good?
>
> Yup.
>



>> "10.1.3.1 Template elements" section of Org manual?
> >
> > I'm confused about what you're referring to here. Isn't that what 0002
> does?
>
> Yes, it does. I saw it, then noticed the missing `org-capture-templates'
> docstring update, and somehow deduced that manual must be missing
> :facepalm:
>




> > Again, happy to squash and provide a single complete patch once we're all
> > done the review. Thanks again, Ihor! :)
>
> Please, also add all the necessary changelog entries to the final commit
> message.
>

Will do! I've attached a prospective patch file but I'm not sure I follow
what you mean by 'add all the necessary changelog entries to the final
commit
message'. Looking at this commit
<https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=294a4d2fe21ffcdc1acbbafed1bfc69a1ece7d13>
I'm guessing that I should have an `* …` entry for every file except
`etc/NEWS` that I changed so I've done that but please do let me know if
that was the wrong interpretation. :)


0001-org-capture.el-Allow-here-as-a-template-target 3.patch
Description: Binary data

Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Ihor Radchenko]

Tim Visher  writes:

>> Also, may you update the docstring of `org-capture-templates'
>
>
> Good catch! This has been done in patch 0004 now. Look good?

Yup.

>> "10.1.3.1 Template elements" section of Org manual?
>
> I'm confused about what you're referring to here. Isn't that what 0002 does?

Yes, it does. I saw it, then noticed the missing `org-capture-templates'
docstring update, and somehow deduced that manual must be missing :facepalm:

> Again, happy to squash and provide a single complete patch once we're all
> done the review. Thanks again, Ihor! :)

Please, also add all the necessary changelog entries to the final commit
message.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at .
Support Org development at ,
or support my work at 

Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Tim Visher]

On Wed, Jun 21, 2023 at 6:29 AM Ihor Radchenko  wrote:

> Tim Visher  writes:
>
> > I've now created patches for updating the manual and NEWS file. Let me
> know
> > how they look!
>
> Thanks! The patches look good, and the commit messages look excellent.
>

٩( ᐛ )و


> You could, however, squash the patches together


Absolutely! Will do once we've approved the whole change. I will use the
commit message of 0001 for the whole patch.


> Also, may you update the docstring of `org-capture-templates'


Good catch! This has been done in patch 0004 now. Look good?


> "10.1.3.1 Template elements" section of Org manual?
>

I'm confused about what you're referring to here. Isn't that what 0002 does?

```
$ cat 0002-squash-doc-org-manual.org-Add-documentation-for-here.patch
>From 4b4bf944129635637c6fd57076f1c963b4c27bf6 Mon Sep 17 00:00:00 2001
From: Tim Visher 
Date: Tue, 20 Jun 2023 15:11:58 -0400
Subject: [PATCH 2/4] squash! doc/org-manual.org: Add documentation for
 `(here)` target

---
 doc/org-manual.org | 4 
 1 file changed, 4 insertions(+)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 21582fe8e..76131f110 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -7946,6 +7946,10 @@ Now lets look at the elements of a template
definition.  Each entry in

 File to the entry that is currently being clocked.

+  - =(here)= ::
+
+The position of =point=.
+
   - =(function function-finding-location)= ::

 Most general way: write your own function which both visits the
--
2.40.1
```

Again, happy to squash and provide a single complete patch once we're all
done the review. Thanks again, Ihor! :)


0002-squash-doc-org-manual.org-Add-documentation-for-here.patch
Description: Binary data


0003-squash-etc-ORG-NEWS-Add-entry-for-here-capture-templ.patch
Description: Binary data


0004-squash-Update-docstring-of-org-capture-templates.patch
Description: Binary data


0001-org-capture.el-Allow-here-as-a-template-target 2.patch
Description: Binary data

Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Ihor Radchenko]

Tim Visher  writes:

> Sorry this took me forever to get to.
>
> I've now created patches for updating the manual and NEWS file. Let me know
> how they look!

Thanks! The patches look good, and the commit messages look excellent.
You could, however, squash the patches together - they are about the
same change; there is no good reason to separate them.

Also, may you update the docstring of `org-capture-templates' and
"10.1.3.1 Template elements" section of Org manual?

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at .
Support Org development at ,
or support my work at 

Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Tim Visher]

On Fri, May 12, 2023 at 12:32 PM Ihor Radchenko  wrote:

> Tim Visher  writes:
>
> > I think this should likely involve an update to the manual but I don't
> want
> > to bother doing that unless the basic approach is approved.
>
> LGTM.
>

Sorry this took me forever to get to.

I've now created patches for updating the manual and NEWS file. Let me know
how they look!


0001-org-capture.el-Allow-here-as-a-template-target 2.patch
Description: Binary data


0003-etc-ORG-NEWS-Add-entry-for-here-capture-template-tar.patch
Description: Binary data


0002-doc-org-manual.org-Add-documentation-for-here-target.patch
Description: Binary data

Re: [PATCH] org-capture.el: Allow `(here)' as a template target

[Ihor Radchenko]

Tim Visher  writes:

> I think this should likely involve an update to the manual but I don't want
> to bother doing that unless the basic approach is approved.

LGTM.
We might also fix on the other side, not demanding (`car-safe') the target to 
be a list.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at .
Support Org development at ,
or support my work at 

[PATCH] org-capture.el: Allow `(here)' as a template target

[Tim Visher]

Hi Everyone,

I think this should likely involve an update to the manual but I don't want
to bother doing that unless the basic approach is approved.

-

>From eccc3f8f805c38b1de55fc8ad60c67a87e2feea4 Mon Sep 17 00:00:00 2001
From: Tim Visher 
Date: Fri, 12 May 2023 11:32:21 -0400
Subject: [PATCH] org-capture.el: Allow `(here)' as a template target

* lisp/org-capture.el (org-capture-set-target-location): Allow `(here)' as
a template
target in addition to `here'.

Templates had no user accessible way to target the current location
directly from a capture template. Attempting to directly utilize the
behavior accessible through a 0 prefix arg exposed the inconsistent
treatment of the `:target` property in
`org-capture`. `org-capture-set-target-location` understood that it
could be both a symbol and a list, while `org-capture` itself required
it to be a list through its use of `car`.

This change opts to make `org-capture-set-target-location` more
liberal in what it accepts rather than making `org-capture` agree that
targets can be lists. This is because the manual implies, especially
in the `(clock)' entry, that targets are expected to be lists even if
they are meant as specific points.

TINYCHANGE
---
 lisp/org-capture.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index d4311dd20..f14e95c5c 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -991,7 +991,8 @@ Store them in the capture property list."
   (let ((target-entry-p t))
 (save-excursion
   (pcase (or target (org-capture-get :target))
- (`here
+ ((or `here
+ `(here))
  (org-capture-put :exact-position (point) :insert-here t))
  (`(file ,path)
  (set-buffer (org-capture-target-buffer path))
-- 
2.40.1


0001-org-capture.el-Allow-here-as-a-template-target.patch
Description: Binary data