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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-12 13:53:37 +01:00
parent 47ea16660e 488eea6d25
commit 275f07c16a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org-latex.el
View File

@ -2291,14 +2291,13 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(concat type ":" raw-path)) (concat type ":" raw-path))
((equal type "file") ((equal type "file")
(if (and (org-file-image-p (if (and (org-file-image-p
(expand-file-name (expand-file-name (org-link-unescape raw-path))
raw-path)
org-export-latex-inline-image-extensions) org-export-latex-inline-image-extensions)
(or (get-text-property 0 'org-no-description (or (get-text-property 0 'org-no-description raw-path)
raw-path)
(equal desc full-raw-path))) (equal desc full-raw-path)))
(setq imgp t) (setq imgp t)
(progn (when (string-match "\\(.+\\)::.+" raw-path) (progn (setq raw-path (org-link-unescape raw-path))
(when (string-match "\\(.+\\)::.+" raw-path)
(setq raw-path (match-string 1 raw-path))) (setq raw-path (match-string 1 raw-path)))
(if (file-exists-p raw-path) (if (file-exists-p raw-path)
(concat type "://" (expand-file-name raw-path)) (concat type "://" (expand-file-name raw-path))