ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' 

Conflicts:
	lisp/ox-html.el
This commit is contained in:
Nicolas Goaziou 2014-04-14 13:56:05 +02:00
parent d34fa17716 f61cd6b7a1
commit ee3cf87d40
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/lisp/ox-groff.el
View File

@ -1251,8 +1251,9 @@ INFO is a plist holding contextual information. See
(imagep (org-export-inline-image-p
link org-groff-inline-image-rules))
(path (cond
((member type '("http" "https" "ftp" "mailto"))
((member type '("http" "https" "ftp"))
(concat type "://" raw-path))
((string= type "mailto") (concat type ":" raw-path))
((string= type "file")
(if (file-name-absolute-p raw-path)
(concat "file://" (expand-file-name raw-path))

5
lisp/ox-html.el
View File

@ -2720,9 +2720,12 @@ INFO is a plist holding contextual information. See
(desc (org-string-nw-p desc))
(path
(cond
((member type '("http" "https" "ftp" "mailto"))
((member type '("http" "https" "ftp"))
(org-link-escape-browser
(org-link-unescape (concat type "://" raw-path))))
((string= type "mailto")
(org-link-escape-browser
(org-link-unescape (concat type ":" raw-path))))
((string= type "file")
;; Treat links to ".org" files as ".html", if needed.
(setq raw-path

3
lisp/ox-latex.el
View File

@ -1906,8 +1906,9 @@ INFO is a plist holding contextual information. See
(imagep (org-export-inline-image-p
link org-latex-inline-image-rules))
(path (cond
((member type '("http" "https" "ftp" "mailto"))
((member type '("http" "https" "ftp"))
(concat type "://" raw-path))
((string= type "mailto") (concat type ":" raw-path))
((string= type "file")
(if (not (file-name-absolute-p raw-path)) raw-path
(concat "file://" (expand-file-name raw-path))))

3
lisp/ox-man.el
View File

@ -645,8 +645,9 @@ INFO is a plist holding contextual information. See
(desc (and (not (string= desc "")) desc))
(path (cond
((member type '("http" "https" "ftp" "mailto"))
((member type '("http" "https" "ftp"))
(concat type "://" raw-path))
((string= type "mailto") (concat type ":" raw-path))
((string= type "file")
(if (file-name-absolute-p raw-path)
(concat "file://" (expand-file-name raw-path))

3
lisp/ox-odt.el
View File

@ -2711,8 +2711,9 @@ INFO is a plist holding contextual information. See
(imagep (org-export-inline-image-p
link org-odt-inline-image-rules))
(path (cond
((member type '("http" "https" "ftp" "mailto"))
((member type '("http" "https" "ftp"))
(concat type "://" raw-path))
((string= type "mailto") (concat type ":" raw-path))
((string= type "file")
(if (file-name-absolute-p raw-path)
(concat "file://" (expand-file-name raw-path))