summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2021-03-27 02:20:45 -0400
committerKyle Meyer <kyle@kyleam.com>2021-03-27 02:20:45 -0400
commite2e89cea8799969b0f8e8a99a2684b986db098e5 (patch)
tree05cb5c48a8fea1dc3faadfb57eaeddbb0e6c7934
parent68db6fc064f1ddf9a8a1da537d662dbf3ba55977 (diff)
parentf10773675d2f60bd4233c11c175a6096ed1d6341 (diff)
downloadorg-mode-e2e89cea8799969b0f8e8a99a2684b986db098e5.tar.gz
Merge branch 'km/from-emacs-master'
-rw-r--r--lisp/org-macs.el3
1 files changed, 2 insertions, 1 deletions
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.