ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org-capture.el: Use %\n instead of %n. 

* org-capture.el (org-capture-fill-template): Use %\n instead of %n as a
template element to be replaced with the nth prompted string.
(org-capture-templates): Update docstring.

* org.texi (Template expansion): Update doc to reflect change.

Using %n triggers errors when the template contains escaped strings,
which happens a lot with links.
This commit is contained in:
Bastien Guerry 2012-04-24 11:54:16 +02:00
parent fdace895fa
commit 1666b910fe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/org.texi
View File

@ -6700,7 +6700,7 @@ dynamic insertion of content. The templates are expanded in the order given her
@r{You may specify a default value and a completion table with}
@r{%^@{prompt|default|completion2|completion3...@}.}
@r{The arrow keys access a prompt-specific history.}
%<n> @r{Insert the text entered at the nth %^@{@var{prompt}@}, where <n> is}
%\n @r{Insert the text entered at the nth %^@{@var{prompt}@}, where @code{n} is}
@r{a number, starting from 1.}
%? @r{After completing the template, position cursor here.}
@end smallexample

4
lisp/org-capture.el
View File

@ -248,7 +248,7 @@ be replaced with content and expanded in this order:
A default value and a completion table ca be specified like this:
%^{prompt|default|completion2|completion3|...}.
%? After completing the template, position cursor here.
%<n> Insert the text entered at the nth %^{prompt}, where <n> is
%\\n Insert the text entered at the nth %^{prompt}, where `n' is
a number, starting from 1.
Apart from these general escapes, you can access information specific to the
@ -1480,7 +1480,7 @@ The template may still contain \"%?\" for cursor positioning."
;; Replace %n escapes with nth %^{...} string
(setq strings (nreverse strings))
(goto-char (point-min))
(while (re-search-forward "%\\([1-9][0-9]*\\)" nil t)
(while (re-search-forward "%\\\\\\([1-9][0-9]*\\)" nil t)
(unless (org-capture-escaped-%)
(replace-match
(nth (1- (string-to-number (match-string 1))) strings)