mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-22 15:10:42 +00:00
Merge branch 'maint'
This commit is contained in:
commit
6e40519811
|
@ -1486,7 +1486,7 @@ The template may still contain \"%?\" for cursor positioning."
|
||||||
;; Interactive template entries
|
;; Interactive template entries
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
(while (and (re-search-forward "%^\\({\\([^}]*\\)}\\)?\\([gGtTuUCLp]\\)?" nil t)
|
(while (and (re-search-forward "%^\\({\\([^}]*\\)}\\)?\\([gGtTuUCLp]\\)?" nil t)
|
||||||
(not (get-text-property (point) 'org-protected)))
|
(not (get-text-property (1- (point)) 'org-protected)))
|
||||||
(unless (org-capture-escaped-%)
|
(unless (org-capture-escaped-%)
|
||||||
(setq char (if (match-end 3) (match-string-no-properties 3))
|
(setq char (if (match-end 3) (match-string-no-properties 3))
|
||||||
prompt (if (match-end 2) (match-string-no-properties 2)))
|
prompt (if (match-end 2) (match-string-no-properties 2)))
|
||||||
|
|
Loading…
Reference in a new issue