org-capture.el: Fix bug in `org-capture-string'

* org-capture.el (org-capture-entry): New variable.
(org-capture-string, org-capture): Use it to possibly skip the
interactive prompt for a capture template.
This commit is contained in:
Bastien Guerry 2012-09-17 18:42:11 +02:00
parent f1f1fc8d48
commit d66cbad3d9
1 changed files with 3 additions and 2 deletions

View File

@ -432,10 +432,11 @@ for a capture buffer.")
;;;###autoload
(defvar org-capture-initial nil)
(defvar org-capture-entry nil)
(defun org-capture-string (string &optional keys)
(interactive "sInitial text: \n")
(let ((org-capture-initial string)
(entry (org-capture-select-template keys)))
(org-capture-entry (org-capture-select-template keys)))
(org-capture)))
(defcustom org-capture-templates-contexts nil
@ -529,7 +530,7 @@ agenda will use the date at point as the default date."
org-capture-link-is-already-stored)
(plist-get org-store-link-plist :annotation)
(ignore-errors (org-store-link nil))))
(entry (org-capture-select-template keys))
(entry (or org-capture-entry (org-capture-select-template keys)))
initial)
(setq initial (or org-capture-initial
(and (org-region-active-p)