mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-30 02:20:01 +00:00
Merge branch 'maint'
This commit is contained in:
commit
a933b34992
80
doc/org.texi
80
doc/org.texi
|
@ -3530,44 +3530,44 @@ string followed by a colon. There can be no space after the colon. The
|
||||||
following list shows examples for each link type.
|
following list shows examples for each link type.
|
||||||
|
|
||||||
@example
|
@example
|
||||||
http://www.astro.uva.nl/~dominik @r{on the web}
|
http://www.astro.uva.nl/~dominik @r{on the web}
|
||||||
doi:10.1000/182 @r{DOI for an electronic resource}
|
doi:10.1000/182 @r{DOI for an electronic resource}
|
||||||
file:/home/dominik/images/jupiter.jpg @r{file, absolute path}
|
file:/home/dominik/images/jupiter.jpg @r{file, absolute path}
|
||||||
/home/dominik/images/jupiter.jpg @r{same as above}
|
/home/dominik/images/jupiter.jpg @r{same as above}
|
||||||
file:papers/last.pdf @r{file, relative path}
|
file:papers/last.pdf @r{file, relative path}
|
||||||
./papers/last.pdf @r{same as above}
|
./papers/last.pdf @r{same as above}
|
||||||
file:/myself@@some.where:papers/last.pdf @r{file, path on remote machine}
|
file:/ssh:myself@@some.where:papers/last.pdf @r{file, path on remote machine}
|
||||||
/myself@@some.where:papers/last.pdf @r{same as above}
|
/ssh:myself@@some.where:papers/last.pdf @r{same as above}
|
||||||
file:sometextfile::NNN @r{file, jump to line number}
|
file:sometextfile::NNN @r{file, jump to line number}
|
||||||
file:projects.org @r{another Org file}
|
file:projects.org @r{another Org file}
|
||||||
file:projects.org::some words @r{text search in Org file}@footnote{
|
file:projects.org::some words @r{text search in Org file}@footnote{
|
||||||
The actual behavior of the search will depend on the value of
|
The actual behavior of the search will depend on the value of
|
||||||
the option @code{org-link-search-must-match-exact-headline}. If its value
|
the option @code{org-link-search-must-match-exact-headline}. If its value
|
||||||
is @code{nil}, then a fuzzy text search will be done. If it is t, then only the
|
is @code{nil}, then a fuzzy text search will be done. If it is t, then only
|
||||||
exact headline will be matched, ignoring spaces and cookies. If the value is
|
the exact headline will be matched, ignoring spaces and cookies. If the
|
||||||
@code{query-to-create}, then an exact headline will be searched; if it is not
|
value is @code{query-to-create}, then an exact headline will be searched; if
|
||||||
found, then the user will be queried to create it.}
|
it is not found, then the user will be queried to create it.}
|
||||||
file:projects.org::*task title @r{heading search in Org
|
file:projects.org::*task title @r{heading search in Org file}@footnote{
|
||||||
file}@footnote{Headline searches always match the exact headline, ignoring
|
Headline searches always match the exact headline, ignoring
|
||||||
spaces and cookies. If the headline is not found and the value of the option
|
spaces and cookies. If the headline is not found and the value of the option
|
||||||
@code{org-link-search-must-match-exact-headline} is @code{query-to-create},
|
@code{org-link-search-must-match-exact-headline} is @code{query-to-create},
|
||||||
then the user will be queried to create it.}
|
then the user will be queried to create it.}
|
||||||
docview:papers/last.pdf::NNN @r{open in doc-view mode at page}
|
docview:papers/last.pdf::NNN @r{open in doc-view mode at page}
|
||||||
id:B7423F4D-2E8A-471B-8810-C40F074717E9 @r{Link to heading by ID}
|
id:B7423F4D-2E8A-471B-8810-C40F074717E9 @r{Link to heading by ID}
|
||||||
news:comp.emacs @r{Usenet link}
|
news:comp.emacs @r{Usenet link}
|
||||||
mailto:adent@@galaxy.net @r{Mail link}
|
mailto:adent@@galaxy.net @r{Mail link}
|
||||||
mhe:folder @r{MH-E folder link}
|
mhe:folder @r{MH-E folder link}
|
||||||
mhe:folder#id @r{MH-E message link}
|
mhe:folder#id @r{MH-E message link}
|
||||||
rmail:folder @r{RMAIL folder link}
|
rmail:folder @r{RMAIL folder link}
|
||||||
rmail:folder#id @r{RMAIL message link}
|
rmail:folder#id @r{RMAIL message link}
|
||||||
gnus:group @r{Gnus group link}
|
gnus:group @r{Gnus group link}
|
||||||
gnus:group#id @r{Gnus article link}
|
gnus:group#id @r{Gnus article link}
|
||||||
bbdb:R.*Stallman @r{BBDB link (with regexp)}
|
bbdb:R.*Stallman @r{BBDB link (with regexp)}
|
||||||
irc:/irc.com/#emacs/bob @r{IRC link}
|
irc:/irc.com/#emacs/bob @r{IRC link}
|
||||||
info:org#External links @r{Info node or index link}
|
info:org#External links @r{Info node or index link}
|
||||||
shell:ls *.org @r{A shell command}
|
shell:ls *.org @r{A shell command}
|
||||||
elisp:org-agenda @r{Interactive Elisp command}
|
elisp:org-agenda @r{Interactive Elisp command}
|
||||||
elisp:(find-file-other-frame "Elisp.org") @r{Elisp form to evaluate}
|
elisp:(find-file-other-frame "Elisp.org") @r{Elisp form to evaluate}
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
@cindex VM links
|
@cindex VM links
|
||||||
|
@ -3578,13 +3578,13 @@ to VM or Wanderlust messages are available when you load the corresponding
|
||||||
libraries from the @code{contrib/} directory:
|
libraries from the @code{contrib/} directory:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
vm:folder @r{VM folder link}
|
vm:folder @r{VM folder link}
|
||||||
vm:folder#id @r{VM message link}
|
vm:folder#id @r{VM message link}
|
||||||
vm://myself@@some.where.org/folder#id @r{VM on remote machine}
|
vm://myself@@some.where.org/folder#id @r{VM on remote machine}
|
||||||
vm-imap:account:folder @r{VM IMAP folder link}
|
vm-imap:account:folder @r{VM IMAP folder link}
|
||||||
vm-imap:account:folder#id @r{VM IMAP message link}
|
vm-imap:account:folder#id @r{VM IMAP message link}
|
||||||
wl:folder @r{WANDERLUST folder link}
|
wl:folder @r{WANDERLUST folder link}
|
||||||
wl:folder#id @r{WANDERLUST message link}
|
wl:folder#id @r{WANDERLUST message link}
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
For customizing Org to add new link types @ref{Adding hyperlink types}.
|
For customizing Org to add new link types @ref{Adding hyperlink types}.
|
||||||
|
|
|
@ -3335,8 +3335,8 @@ Another text. (ref:text)
|
||||||
(should (equal (concat (if (memq system-type '(windows-nt cygwin)) "file:///" "file://") (expand-file-name "/local.org"))
|
(should (equal (concat (if (memq system-type '(windows-nt cygwin)) "file:///" "file://") (expand-file-name "/local.org"))
|
||||||
(org-export-file-uri "/local.org")))
|
(org-export-file-uri "/local.org")))
|
||||||
;; Remote files start with "file://"
|
;; Remote files start with "file://"
|
||||||
(should (equal "file://myself@some.where:papers/last.pdf"
|
(should (equal "file://ssh:myself@some.where:papers/last.pdf"
|
||||||
(org-export-file-uri "/myself@some.where:papers/last.pdf")))
|
(org-export-file-uri "/ssh:myself@some.where:papers/last.pdf")))
|
||||||
(should (equal "file://localhost/etc/fstab"
|
(should (equal "file://localhost/etc/fstab"
|
||||||
(org-export-file-uri "//localhost/etc/fstab")))
|
(org-export-file-uri "//localhost/etc/fstab")))
|
||||||
;; Expand filename starting with "~".
|
;; Expand filename starting with "~".
|
||||||
|
|
Loading…
Reference in a new issue