diff options
author | Glenn Morris <rgm@gnu.org> | 2018-02-28 16:55:41 -0500 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2019-01-13 12:43:04 -0500 |
commit | 16c8187db1df91086a188f1e21ff4e251f38b695 (patch) | |
tree | 8f2570dd8860e2e13241d5836bf8fff3ae500723 | |
parent | 31a861e0d3c8c0966ca1d067f6207ab3d167bd1e (diff) | |
download | org-mode-16c8187db1df91086a188f1e21ff4e251f38b695.tar.gz |
Backport commit d5f6ff99c from Emacs
* lisp/org.el (image-refresh):
* lisp/ox-odt.el (clear-image-cache, image-size): Declare.
Quieten without-x org compilation
d5f6ff99c2b594919931b277a2d94d3a289ca764
Glenn Morris
Wed Feb 28 16:55:41 2018 -0500
-rw-r--r-- | lisp/org.el | 3 | ||||
-rw-r--r-- | lisp/ox-odt.el | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/org.el b/lisp/org.el index dee25de..9c8b7b7 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -18728,6 +18728,9 @@ INCLUDE-LINKED is passed to `org-display-inline-images'." (org-toggle-inline-images) (org-toggle-inline-images))) +;; For without-x builds. +(declare-function image-refresh "image" (spec &optional frame)) + (defun org-display-inline-images (&optional include-linked refresh beg end) "Display inline images. diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index f52b590..c14ee0b 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -2194,6 +2194,10 @@ SHORT-CAPTION are strings." (org-odt-create-manifest-file-entry media-type target-file) target-file)) +;; For --without-x builds. +(declare-function clear-image-cache "image.c" (&optional filter)) +(declare-function image-size "image.c" (spec &optional pixels frame)) + (defun org-odt--image-size (file info &optional user-width user-height scale dpi embed-as) (let* ((--pixels-to-cms |