From: Ryo TAKAISHI <ryo.takaishi.0@gmail.com>
To: Nicolas Goaziou <n.goaziou@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Capture: Expand keyword within %(SEXP) in template
Date: Mon, 05 Nov 2012 00:05:55 +0900 [thread overview]
Message-ID: <87vcdl4dd8.fsf@gmail.com> (raw)
In-Reply-To: <87vcdlbjjq.fsf@gmail.com> (Nicolas Goaziou's message of "Sun, 04 Nov 2012 14:10:33 +0100")
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
Nicolas Goaziou <n.goaziou@gmail.com> writes:
> Otherwise the code is fine. Would you provide a complete patch, i.e.
> with `git format-patch'? The changelog entry may be:
I create a complete patch for current commit.
Regards,
Ryo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-capture-Expand-keywords-within-sexp-placeholder-.patch --]
[-- Type: text/x-patch, Size: 3194 bytes --]
From d82c99bb643e2c61e1f5b598a687160340a1558f Mon Sep 17 00:00:00 2001
From: Ryo TAKAISHI <ryo.takaishi.0@gmail.com>
Date: Mon, 5 Nov 2012 00:01:08 +0900
Subject: [PATCH] org-capture: Expand keywords within %(sexp) placeholder in
template
* lisp/org-capture.el: (org-capture--expand-keyword-in-embedded-elisp): New function.
(org-capture-expand-embedded-elisp): Use new function.
---
doc/org.texi | 4 +++-
lisp/org-capture.el | 22 ++++++++++++++++++++--
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index b23f492..dd1d9b9 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -6852,7 +6852,9 @@ dynamic insertion of content. The templates are expanded in the order given her
@smallexample
%[@var{file}] @r{Insert the contents of the file given by @var{file}.}
-%(@var{sexp}) @r{Evaluate Elisp @var{sexp} and replace with the result.}
+%(@var{sexp}) @r{Evaluate Elisp @var{sexp} and replace with the result@footnote{For }
+ @r{convenience, %:keyword (see above) placeholders within the expression}
+ @r{will be expanded.}.}
@r{The sexp must return a string.}
%<...> @r{The result of format-time-string on the ... format specification.}
%t @r{Timestamp, date only.}
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 1dfffc6..d0f7297 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -223,7 +223,9 @@ freely formatted text. Furthermore, the following %-escapes will
be replaced with content and expanded in this order:
%[pathname] Insert the contents of the file given by `pathname'.
- %(sexp) Evaluate elisp `(sexp)' and replace with the result.
+ %(sexp) Evaluate elisp `(sexp)' and replace with the result@(For
+ convenience, %:keyword (see above) placeholders within the expression
+ will be expanded.).
%<...> The result of format-time-string on the ... format specification.
%t Time stamp, date only.
%T Time stamp with date and time.
@@ -1621,10 +1623,26 @@ The template may still contain \"%?\" for cursor positioning."
(goto-char (match-beginning 0))
(let ((template-start (point)))
(forward-char 1)
- (let ((result (org-eval (read (current-buffer)))))
+ (let* ((sexp (org-capture-expand-keyword-in-embedded-elisp
+ (read (current-buffer))))
+ (result (org-eval sexp)))
(delete-region template-start (point))
(insert result))))))
+(defun org-capture--expand-keyword-in-embedded-elisp (attr)
+ "Recursively replace capture link keywords in ATTR sexp.
+Such keywords are prefixed with "%:". See `org-capture-template`
+for more information."
+ (cond ((consp attr)
+ (mapcar 'org-capture--expand-keyword-in-embedded-elisp attr))
+ ((symbolp attr)
+ (let* ((attr-symbol (symbol-name attr))
+ (key (and (string-match "%\\(:.*\\)" attr-symbol)
+ (intern (match-string 1 attr-symbol)))))
+ (or (plist-get org-store-link-plist key)
+ attr)))
+ (t attr)))
+
(defun org-capture-inside-embedded-elisp-p ()
"Return non-nil if point is inside of embedded elisp %(sexp)."
(let (beg end)
--
1.7.9.5
next prev parent reply other threads:[~2012-11-04 15:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-02 9:20 [PATCH] Capture: Expand keyword within %(SEXP) in template Ryo TAKAISHI
2012-11-02 11:50 ` Nicolas Goaziou
2012-11-02 13:55 ` Ryo TAKAISHI
2012-11-02 14:11 ` Nicolas Goaziou
2012-11-02 15:36 ` Ryo TAKAISHI
2012-11-03 8:45 ` Nicolas Goaziou
2012-11-04 7:51 ` Ryo TAKAISHI
2012-11-04 13:10 ` Nicolas Goaziou
2012-11-04 15:05 ` Ryo TAKAISHI [this message]
2012-11-05 0:38 ` Nicolas Goaziou
2012-11-05 12:34 ` Ryo TAKAISHI
2012-11-05 12:39 ` 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=87vcdl4dd8.fsf@gmail.com \
--to=ryo.takaishi.0@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=n.goaziou@gmail.com \
/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).