diff options
| author | Bastien Guerry <bzg@gnu.org> | 2012-12-12 17:47:07 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2012-12-12 17:47:07 +0100 |
| commit | 63aa098259339e924d8a7d40c59a34e579132af6 (patch) | |
| tree | a23b00ff5e7fd931aadc58f1cffdd00f1f27db5f /lisp/org/org-latex.el | |
| parent | 14b8c3d926ef813f621f95b0dcd059192d3d898c (diff) | |
| download | emacs-63aa098259339e924d8a7d40c59a34e579132af6.tar.gz | |
Merge upstream Org (from commit 488eea)
Diffstat (limited to 'lisp/org/org-latex.el')
| -rw-r--r-- | lisp/org/org-latex.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el index 9ce84f14e92..a53470df8be 100644 --- a/lisp/org/org-latex.el +++ b/lisp/org/org-latex.el @@ -2291,14 +2291,13 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER." (concat type ":" raw-path)) ((equal type "file") (if (and (org-file-image-p - (expand-file-name - raw-path) + (expand-file-name (org-link-unescape raw-path)) org-export-latex-inline-image-extensions) - (or (get-text-property 0 'org-no-description - raw-path) + (or (get-text-property 0 'org-no-description raw-path) (equal desc full-raw-path))) (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))) (if (file-exists-p raw-path) (concat type "://" (expand-file-name raw-path)) |