>>>>> Bastien writes:
B> Hi Samuel, [email protected] (Samuel W. Flint) writes:
>> In an attempt at automating a part of my workflow, I found that
>> org-capture's %l didn't quite fit what I needed. Normally,
>> org-store-link does the right thing, but for some capture tasks,
>> I want to custom generate the description, so %l doesn't work.
>> I've attached a patch that adds %L, a version that doesn't add
>> the link brackets.
B> It looks good to me for Org 9.5. Can you add a Changelog entry
B> to your patch and also patch the tests and the manual, if needed?
Apologies for spamming you with multiple copies Bastien.
Certainly! Hopefully this looks better. I didn't see any tests for %a,
%A or %l already, and I don't have time atm to write them, otherwise I'd
have done so.
I can mark this as TINYCHANGE, if necessary, as I don't have a copyright
assignment on file, though I'm willing to do so.
Thanks,
Sam
B> See
B> <https://orgmode.org/worg/org-contribute.html#commit-messages>
B> for the format of the Changelog.
B> Thanks,
B> -- Bastien
--
Samuel W. Flint
4096R/FA13D704
(F50D 862B 4F65 5943 A8C2 EF0E 86C9 3E7A FA13 D704)
λs.(s s) λs.(s s)
>From 02de43c3457419f1031f4988d6c95fac535134e7 Mon Sep 17 00:00:00 2001
From: "Samuel W. Flint" <[email protected]>
Date: Mon, 14 Sep 2020 09:07:07 -0500
Subject: [PATCH] Add in support for filling in the bare link in org capture
* doc/org-manual.org: Document new %L capture template formatting
directive.
* lisp/org-capture.el: (org-capture-templates) Document new %L capture
template formatting directive.
* lisp/org-capture.el: (org-capture-fill-template) Add in support for
%L, bare link formatting, in org-capture-fill-template.
---
doc/org-manual.org | 4 ++++
lisp/org-capture.el | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 7ab7d1c94..229575b13 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -7799,6 +7799,10 @@ here:
Like =%a=, but only insert the literal link.
+- =%L= ::
+
+ Like =%l=, but without brackets (the link content itself).
+
- =%c= ::
Current kill ring head.
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index d73e927fc..2ef55cd5c 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -315,6 +315,7 @@ be replaced with content and expanded:
%a Annotation, normally the link created with `org-store-link'.
%A Like %a, but prompt for the description part.
%l Like %a, but only insert the literal link.
+ %L Like %l, but without brackets (the link content itself).
%c Current kill ring head.
%x Content of the X clipboard.
%k Title of currently clocked task.
@@ -1592,6 +1593,9 @@ The template may still contain \"%?\" for cursor positioning."
(v-l (if (and v-a (string-match l-re v-a))
(replace-match "[[\\1]]" nil nil v-a)
v-a))
+ (v-L (if (or v-a (string-match l-re v-a))
+ (replace-match "\\1" nil nil v-a)
+ v-a))
(v-n user-full-name)
(v-k (if (marker-buffer org-clock-marker)
(org-no-properties org-clock-heading)
@@ -1644,7 +1648,7 @@ The template may still contain \"%?\" for cursor positioning."
;; Mark %() embedded elisp for later evaluation.
(org-capture-expand-embedded-elisp 'mark)
;; Expand non-interactive templates.
- (let ((regexp "%\\(:[-A-Za-z]+\\|<\\([^>\n]+\\)>\\|[aAcfFikKlntTuUx]\\)"))
+ (let ((regexp "%\\(:[-A-Za-z]+\\|<\\([^>\n]+\\)>\\|[aAcfFikKlLntTuUx]\\)"))
(save-excursion
(while (re-search-forward regexp nil t)
;; `org-capture-escaped-%' may modify buffer and cripple
@@ -1681,6 +1685,7 @@ The template may still contain \"%?\" for cursor positioning."
(?k v-k)
(?K v-K)
(?l v-l)
+ (?L v-L)
(?n v-n)
(?t v-t)
(?T v-T)
--
2.18.1
