ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-17 18:42:19 +02:00
parent a99402facf d66cbad3d9
commit 3c0155c6e4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org-capture.el
View File

@ -432,10 +432,11 @@ for a capture buffer.")
;;;###autoload ;;;###autoload
(defvar org-capture-initial nil) (defvar org-capture-initial nil)
(defvar org-capture-entry nil)
(defun org-capture-string (string &optional keys) (defun org-capture-string (string &optional keys)
(interactive "sInitial text: \n") (interactive "sInitial text: \n")
(let ((org-capture-initial string) (let ((org-capture-initial string)
(entry (org-capture-select-template keys))) (org-capture-entry (org-capture-select-template keys)))
(org-capture))) (org-capture)))
(defcustom org-capture-templates-contexts nil (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) org-capture-link-is-already-stored)
(plist-get org-store-link-plist :annotation) (plist-get org-store-link-plist :annotation)
(ignore-errors (org-store-link nil)))) (ignore-errors (org-store-link nil))))
(entry (org-capture-select-template keys)) (entry (or org-capture-entry (org-capture-select-template keys)))
initial) initial)
(setq initial (or org-capture-initial (setq initial (or org-capture-initial
(and (org-region-active-p) (and (org-region-active-p)