forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
fbcdc5d6d5
|
@ -1608,8 +1608,6 @@ The template may still contain \"%?\" for cursor positioning."
|
||||||
(insert-file-contents filename)
|
(insert-file-contents filename)
|
||||||
(error (insert (format "%%![Couldn't insert %s: %s]"
|
(error (insert (format "%%![Couldn't insert %s: %s]"
|
||||||
filename error)))))))
|
filename error)))))))
|
||||||
;; %() embedded elisp
|
|
||||||
(org-capture-expand-embedded-elisp)
|
|
||||||
|
|
||||||
;; The current time
|
;; The current time
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
|
@ -1639,6 +1637,10 @@ The template may still contain \"%?\" for cursor positioning."
|
||||||
(intern (match-string 1))) ""))
|
(intern (match-string 1))) ""))
|
||||||
(replace-match x t t)))))
|
(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
|
;; Turn on org-mode in temp buffer, set local variables
|
||||||
;; This is to support completion in interactive prompts
|
;; This is to support completion in interactive prompts
|
||||||
(let ((org-inhibit-startup t)) (org-mode))
|
(let ((org-inhibit-startup t)) (org-mode))
|
||||||
|
|
Loading…
Reference in a new issue