tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Kaushal Modi 2017-06-09 16:18:24 -04:00
parent cf505d2ebb 7cd7b90dcb
commit a933b34992
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/org.texi
View File

@ -3536,19 +3536,19 @@ 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.}

4
testing/lisp/test-ox.el
View File

@ -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 "~".