Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-02-28 13:38:57 +01:00
commit 9d13555042

View file

@ -651,11 +651,13 @@ The visited file needs to be part of a publishing project in
`org-publish-project-alist' for this to work. The function `org-publish-project-alist' for this to work. The function
delegates most of the work to `org-protocol-create'." delegates most of the work to `org-protocol-create'."
(interactive) (interactive)
(require 'org-publish) (require 'ox-publish)
(let ((all (or (org-publish-get-project-from-filename buffer-file-name)))) (let ((all (or (org-publish-get-project-from-filename buffer-file-name))))
(if all (org-protocol-create (cdr all)) (if all (org-protocol-create (cdr all))
(message "Not in an org-project. Did you mean `%s'?" (message "%s"
(substitute-command-keys "`\\[org-protocol-create]'"))))) (substitute-command-keys
"Not in an Org project. \
Did you mean `\\[org-protocol-create]'?")))))
(defun org-protocol-create (&optional project-plist) (defun org-protocol-create (&optional project-plist)
"Create a new org-protocol project interactively. "Create a new org-protocol project interactively.