From 0590973aa7d487ed014ed6bcb5db6459b07218ab Mon Sep 17 00:00:00 2001 From: Nicholas Vollmer Date: Mon, 8 Jun 2020 14:19:35 -0400 Subject: [PATCH] lisp/org-capture.el: Set `org-capture-current-plist' before `org-capture-mode-hook' * org-capture.el (org-capture-place-template): Allow `org-capture-current-plist' access during `org-capture-mode-hook' Ensure consistency between org-capture's hooks. `org-capture-after-finalize-hook' is now the only hook that cannot access `org-capture-current-plst' because the capture buffer is killed when it is run. --- etc/ORG-NEWS | 1 + lisp/org-capture.el | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index f7c898f84..8db9db645 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -478,6 +478,7 @@ function, ~org-edit-latex-fragment~. This functions in a comparable manner to editing inline source blocks, bringing up a minibuffer set to LaTeX mode. The math-mode deliminators are read only. +*** org-capture: ~org-capture-current-plist~ accessible during ~org-capture-mode-hook~ * Version 9.3 ** Incompatible changes diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 9136d331b..7dde7e194 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1128,8 +1128,8 @@ may have been stored before." (`plain (org-capture-place-plain-text)) (`item (org-capture-place-item)) (`checkitem (org-capture-place-item))) - (org-capture-mode 1) - (setq-local org-capture-current-plist org-capture-plist)) + (setq-local org-capture-current-plist org-capture-plist) + (org-capture-mode 1)) (defun org-capture-place-entry () "Place the template as a new Org entry." -- 2.26.2