Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-02-07 10:03:10 +01:00
commit cadffe8e1a

View file

@ -259,11 +259,11 @@ In any case, the ID of the entry is returned."
id))))) id)))))
(defun org-id-get-with-outline-path-completion (&optional targets) (defun org-id-get-with-outline-path-completion (&optional targets)
"Use outline-path-completion to retrieve the ID of an entry. "Use `outline-path-completion' to retrieve the ID of an entry.
TARGETS may be a setting for `org-refile-targets' to define the eligible TARGETS may be a setting for `org-refile-targets' to define
headlines. When omitted, all headlines in all agenda files are eligible headlines. When omitted, all headlines in the current
eligible. file are eligible. This function returns the ID of the entry.
It returns the ID of the entry. If necessary, the ID is created." If necessary, the ID is created."
(let* ((org-refile-targets (or targets '((nil . (:maxlevel . 10))))) (let* ((org-refile-targets (or targets '((nil . (:maxlevel . 10)))))
(org-refile-use-outline-path (org-refile-use-outline-path
(if (caar org-refile-targets) 'file t)) (if (caar org-refile-targets) 'file t))