Patch org-capure-fill-template

Patch org-capure-fill-template

[Roberto Huelga]

[-- Attachment #1.1: Type: text/plain, Size: 72 bytes --]

Patch proposal fro org-capture-fill-template

Hope it's useful.
Thanks.

[-- Attachment #1.2: Type: text/html, Size: 140 bytes --]

[-- Attachment #2: 0001-org-capture.el-Fix-expand-template-order.patch --]
[-- Type: application/octet-stream, Size: 1503 bytes --]

From 3298e255aa8cc0c0bb5367a469d578fc8ed45600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Huelga=20D=C3=ADaz?= <rhuelga@gmail.com>
Date: Wed, 29 Oct 2014 18:29:11 +0100
Subject: [PATCH] org-capture.el: Fix expand template order

* lisp/org-capture.el (org-capture-fill-template): expand %(sexp) after
  %:keywords

When a template is expanded first the simple %-escapes, %:keywords and
after that the %(sexp).

Patch proposal by Roberto Huelga Díaz.

TINYCHANGE
---
 lisp/org-capture.el |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 9f8107e..65de098 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1608,8 +1608,6 @@ The template may still contain \"%?\" for cursor positioning."
 		(insert-file-contents filename)
 	      (error (insert (format "%%![Couldn't insert %s: %s]"
 				     filename error)))))))
-      ;; %() embedded elisp
-      (org-capture-expand-embedded-elisp)

       ;; The current time
       (goto-char (point-min))
@@ -1639,6 +1637,10 @@ The template may still contain \"%?\" for cursor positioning."
 					(intern (match-string 1))) ""))
 		 (replace-match x t t)))))

+      ;; %() embedded elisp
+      (goto-char (point-min))
+      (org-capture-expand-embedded-elisp)
+
       ;; Turn on org-mode in temp buffer, set local variables
       ;; This is to support completion in interactive prompts
       (let ((org-inhibit-startup t)) (org-mode))
--
1.7.10.2 (Apple Git-33)

Re: Patch org-capure-fill-template

[Nicolas Goaziou]

Hello,

Roberto Huelga <rhuelga@gmail.com> writes:

> Patch proposal fro org-capture-fill-template

Thanks for your patch. However, I'd like to know your motivation for it
as I fail to see how it is superior to the current design.


Regards,

-- 
Nicolas Goaziou

Re: Patch org-capure-fill-template

[Roberto Huelga]

Suppose you want to write the parent directory name in your capture so write a
template like

"* %(file-name-nondirectory (directory-file-name (file-name-directory \"%F\")))"

Without the patch, file-name-directory get the useless string "%F"
instead of a string
with the full path name of the file.

The orgmode manual template expansion page describe

     %(sexp)     Evaluate Elisp sexp and replace with the result.
                       For convenience, %:keyword (see below) placeholders
                       within the expression will be expanded prior to this.
                       The sexp must return a string.

But without the patch is not true, first is expanded %(sexp) and after
that the %OneLetter and later the %:keyword

Thanks for your work at the awesome orgmode.


2014-10-30 16:48 GMT+01:00 Nicolas Goaziou <mail@nicolasgoaziou.fr>:
> Hello,
>
> Roberto Huelga <rhuelga@gmail.com> writes:
>
>> Patch proposal fro org-capture-fill-template
>
> Thanks for your patch. However, I'd like to know your motivation for it
> as I fail to see how it is superior to the current design.
>
>
> Regards,
>
> --
> Nicolas Goaziou

Re: Patch org-capure-fill-template

[Nicolas Goaziou]

Roberto Huelga <rhuelga@gmail.com> writes:

> Suppose you want to write the parent directory name in your capture so write a
> template like
>
> "* %(file-name-nondirectory (directory-file-name (file-name-directory \"%F\")))"
>
> Without the patch, file-name-directory get the useless string "%F"
> instead of a string
> with the full path name of the file.
>
> The orgmode manual template expansion page describe
>
>      %(sexp)     Evaluate Elisp sexp and replace with the result.
>                        For convenience, %:keyword (see below) placeholders
>                        within the expression will be expanded prior to this.
>                        The sexp must return a string.
>
> But without the patch is not true, first is expanded %(sexp) and after
> that the %OneLetter and later the %:keyword

Understood. Applied, thank you.

Regards,

Re: Patch org-capure-fill-template

[Roberto Huelga]

I founded a section in the org-contribute.html with the names of the
tiny change contributors,
Do you know how could I get my name there? This is my second
tinychange patch. And
get my name in the list will make my day.

Thanks

2014-11-02 10:44 GMT+01:00 Nicolas Goaziou <mail@nicolasgoaziou.fr>:
> Roberto Huelga <rhuelga@gmail.com> writes:
>
>> Suppose you want to write the parent directory name in your capture so write a
>> template like
>>
>> "* %(file-name-nondirectory (directory-file-name (file-name-directory \"%F\")))"
>>
>> Without the patch, file-name-directory get the useless string "%F"
>> instead of a string
>> with the full path name of the file.
>>
>> The orgmode manual template expansion page describe
>>
>>      %(sexp)     Evaluate Elisp sexp and replace with the result.
>>                        For convenience, %:keyword (see below) placeholders
>>                        within the expression will be expanded prior to this.
>>                        The sexp must return a string.
>>
>> But without the patch is not true, first is expanded %(sexp) and after
>> that the %OneLetter and later the %:keyword
>
> Understood. Applied, thank you.
>
> Regards,

Re: Patch org-capure-fill-template

[Nicolas Goaziou]

Roberto Huelga <rhuelga@gmail.com> writes:

> I founded a section in the org-contribute.html with the names of the
> tiny change contributors,
> Do you know how could I get my name there? This is my second
> tinychange patch. And
> get my name in the list will make my day.

Your name is already in that list. You may need to refresh your
browser's cache.


Regards,

-- 
Nicolas Goaziou