forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
52d4ca4b29
29
doc/org.texi
29
doc/org.texi
|
@ -7382,6 +7382,7 @@ gnus | %:group, @r{for messages also all email fiel
|
||||||
eww, w3, w3m | %:url
|
eww, w3, w3m | %:url
|
||||||
info | %:file %:node
|
info | %:file %:node
|
||||||
calendar | %:date
|
calendar | %:date
|
||||||
|
org-protocol | %:link %:description %:annotation
|
||||||
@end smallexample
|
@end smallexample
|
||||||
|
|
||||||
@noindent
|
@noindent
|
||||||
|
@ -7623,22 +7624,15 @@ javascript:location.href='org-protocol://store-link?url='+
|
||||||
@cindex capture protocol
|
@cindex capture protocol
|
||||||
@cindex protocol, capture
|
@cindex protocol, capture
|
||||||
|
|
||||||
@cindex capture, %:url placeholder
|
|
||||||
@cindex %:url template expansion in capture
|
|
||||||
@cindex capture, %:title placeholder
|
|
||||||
@cindex %:title template expansion in capture
|
|
||||||
Activating @code{capture} handler pops up a @samp{Capture} buffer and fills
|
Activating @code{capture} handler pops up a @samp{Capture} buffer and fills
|
||||||
the capture template associated to the @samp{X} key with them. The template
|
the capture template associated to the @samp{X} key with them.
|
||||||
refers to the data through @code{%:url} and @code{%:title} placeholders.
|
|
||||||
Moreover, any selected text in the browser is appended to the body of the
|
|
||||||
entry.
|
|
||||||
|
|
||||||
@example
|
@example
|
||||||
emacsclient org-protocol://capture?template=X?url=URL?title=TITLE?body=BODY
|
emacsclient org-protocol://capture?template=X?url=URL?title=TITLE?body=BODY
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
To use this feature, add a bookmark with an arbitrary name, e.g.
|
To use this feature, add a bookmark with an arbitrary name, e.g. @samp{Org:
|
||||||
@samp{Org: capture} and enter this as @samp{Location}:
|
capture} and enter this as @samp{Location}:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
javascript:location.href='org-protocol://template=x'+
|
javascript:location.href='org-protocol://template=x'+
|
||||||
|
@ -7652,6 +7646,21 @@ The result depends on the capture template used, which is set in the bookmark
|
||||||
itself, as in the example above, or in
|
itself, as in the example above, or in
|
||||||
@code{org-protocol-default-template-key}.
|
@code{org-protocol-default-template-key}.
|
||||||
|
|
||||||
|
@cindex capture, %:link placeholder
|
||||||
|
@cindex %:link template expansion in capture
|
||||||
|
@cindex capture, %:description placeholder
|
||||||
|
@cindex %:description template expansion in capture
|
||||||
|
@cindex capture, %:annotation placeholder
|
||||||
|
@cindex %:annotation template expansion in capture
|
||||||
|
The following template placeholders are available:
|
||||||
|
|
||||||
|
@example
|
||||||
|
%:link The URL
|
||||||
|
%:description The webpage title
|
||||||
|
%:annotation Equivalent to [[%:link][%:description]]
|
||||||
|
%i The selected text
|
||||||
|
@end example
|
||||||
|
|
||||||
@node @code{open-source} protocol
|
@node @code{open-source} protocol
|
||||||
@subsection @code{open-source} protocol
|
@subsection @code{open-source} protocol
|
||||||
@cindex open-source protocol
|
@cindex open-source protocol
|
||||||
|
|
|
@ -9838,7 +9838,9 @@ active region."
|
||||||
(car org-stored-links)))))
|
(car org-stored-links)))))
|
||||||
|
|
||||||
(defun org-store-link-props (&rest plist)
|
(defun org-store-link-props (&rest plist)
|
||||||
"Store link properties, extract names, addresses and dates."
|
"Store link properties.
|
||||||
|
The properties are pre-processed by extracting names, addresses
|
||||||
|
and dates."
|
||||||
(let ((x (plist-get plist :from)))
|
(let ((x (plist-get plist :from)))
|
||||||
(when x
|
(when x
|
||||||
(let ((adr (mail-extract-address-components x)))
|
(let ((adr (mail-extract-address-components x)))
|
||||||
|
|
Loading…
Reference in New Issue