[elpa] externals/org f107736 2/4: Backport commit 331ddd803 from Emacs

[ELPA Syncer]

branch: externals/org
commit f10773675d2f60bd4233c11c175a6096ed1d6341
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Kyle Meyer <kyle@kyleam.com>

    Backport commit 331ddd803 from Emacs
    
    * lisp/org-macs.el (org--string-from-props): Pacify warnings
    about unknown functions in non-GUI bilds.
    
    Address some --without-x byte-compilation warnings
    331ddd803a72056d0f0c70e5a677e0d4a6300584
    Basil L. Contovounesios
    Fri Mar 26 17:35:34 2021 +0000
---
 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 8fa523e..b739faa 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -869,7 +869,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.