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

Merge branch 'maint' 

Conflicts:
	lisp/ox-html.el
This commit is contained in:
Nicolas Goaziou 2014-04-14 12:41:38 +02:00
parent 3a9bbb0ec3 fc1f7d752f
commit d34fa17716
7 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
lisp/ox-html.el
View File

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

2
lisp/ox-latex.el
View File

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

4
lisp/ox-man.el
View File

@ -646,10 +646,8 @@ INFO is a plist holding contextual information. See
(path (cond
((member type '("http" "https" "ftp" "mailto"))
(concat type ":" raw-path))
(concat type "://" raw-path))
((string= type "file")
(when (string-match "\\(.+\\)::.+" raw-path)
(setq raw-path (match-string 1 raw-path)))
(if (file-name-absolute-p raw-path)
(concat "file://" (expand-file-name raw-path))
(concat "file://" raw-path)))

2
lisp/ox-md.el
View File

@ -342,7 +342,7 @@ a communication channel."
(path
(cond
((member type '("http" "https" "ftp"))
(concat type ":" raw-path))
(concat type "://" raw-path))
((equal type "file")
(let ((path (funcall link-org-files-as-md raw-path)))
(if (not (file-name-absolute-p path)) path

2
lisp/ox-odt.el
View File

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

2
lisp/ox-texinfo.el
View File

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