>From 4407cd46e3cf8339a9c90d4dde8337b7dbaca048 Mon Sep 17 00:00:00 2001
From: "Toby S. Cubitt"
Date: Mon, 23 Apr 2012 17:20:19 +0200
Subject: [PATCH] org-capture.el: Fixed bug in org-capture-templates %
expandos
* lisp/org-capture.el (org-capture-fill-template): Fixed regexp for
% expandos to match any positive integer.
(org-capture-templates): Updated docstring accordingly.
* doc/org.texi: Updated documentation accordingly.
---
doc/org.texi | 4 ++--
lisp/org-capture.el | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index a25572d..bb98713 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -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}
@address@hidden|default|completion2|address@hidden
@r{The arrow keys access a prompt-specific history.}
-% @r{Insert the text entered for at the nth %^{prompt}, where }
- @r{represents a digit, 1 to 9.}
+% @r{Insert the text entered at the nth %^{prompt}, where is}
+ @r{a number, starting from 1.}
%? @r{After completing the template, position cursor here.}
@end smallexample
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 7fbd438..d507cc2 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -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.
- % Insert the text entered for at the nth %^{prompt}, where
- represents a digit, 1 to 9.
+ % Insert the text entered at the nth %^{prompt}, where 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)
--
1.7.8.5