Revert "Fix link export"

This reverts commit fc1f7d752f.
This commit is contained in:
Nicolas Goaziou 2014-04-16 22:46:53 +02:00
parent 7b3c11f797
commit 73c141e43e
7 changed files with 11 additions and 7 deletions

View File

@ -1252,8 +1252,10 @@ 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)))

View File

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

View File

@ -1798,7 +1798,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))))

View File

@ -646,8 +646,10 @@ 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)))

View File

@ -320,7 +320,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

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))

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))