Merge branch 'km/from-emacs-master'

2021-03-27 02:20:45 -04:00 · 2021-03-27 02:20:45 -04:00 · e2e89cea87
parent 68db6fc064 f10773675d
commit e2e89cea87
1 changed files with 2 additions and 1 deletions
--- 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.