Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Carsten Dominik 2010-07-05 19:01:13 +02:00
commit 1217e02e56
1 changed files with 1 additions and 1 deletions

View File

@ -1894,7 +1894,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(t (insert "\\texttt{" desc "}")))))))
(defun org-export-latex-format-image (path caption label attr)
(defun org-export-latex-format-image (path caption label attr &optional shortn)
"Format the image element, depending on user settings."
(let (ind floatp wrapp multicolumnp placement figenv)
(setq floatp (or caption label))