mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

org-capture.el: Fixed bug in org-capture-templates %<n> expandos 

* lisp/org-capture.el (org-capture-fill-template): Fixed regexp for
  %<n> expandos to match any positive integer.
  (org-capture-templates): Updated docstring accordingly.

* doc/org.texi: Updated documentation accordingly.
This commit is contained in:
Toby S. Cubitt 2012-04-23 17:20:19 +02:00 committed by Bastien Guerry
parent 077af66a6f
commit b7982a0024
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/org.texi
View File

@ -6700,8 +6700,8 @@ 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 for at the nth %^{prompt}, where <n>}
@r{represents a digit, 1 to 9.}
%<n> @r{Insert the text entered at the nth %^{prompt}, where <n> is}
@r{a number, starting from 1.}
%? @r{After completing the template, position cursor here.}
@end smallexample

6
lisp/org-capture.el
View File

@ -248,8 +248,8 @@ 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 for at the nth %^{prompt}, where <n>
represents a digit, 1 to 9.
%<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
link type that is created. For example, calling `org-capture' in emails
@ -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]\\)+" 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)