[elpa] externals/org e2e89ce 3/4: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit e2e89cea8799969b0f8e8a99a2684b986db098e5
Merge: 68db6fc f107736
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-master'
---
 lisp/org-macs.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 7efe413..dc0c42b 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -895,7 +895,8 @@ delimiting S."
                    (let ((width (plist-get props :width)))
                      (and (wholenump width) width)))
                   (`(image . ,_)
-                   (ceiling (car (image-size spec))))
+                    (and (fboundp 'image-size)
+                         (ceiling (car (image-size spec)))))
                   ((pred stringp)
                    ;; Displayed string could contain invisible parts,
                    ;; but no nested display.