diff options
| author | Glenn Morris | 2018-02-28 16:55:41 -0500 |
|---|---|---|
| committer | Glenn Morris | 2018-02-28 16:55:41 -0500 |
| commit | d5f6ff99c2b594919931b277a2d94d3a289ca764 (patch) | |
| tree | fd425d3d5de36291edbe67763de8a619ab7e2fc6 | |
| parent | e1a26cdad98ae101fe03bd5484974f7db1cbfd59 (diff) | |
| download | emacs-d5f6ff99c2b594919931b277a2d94d3a289ca764.tar.gz emacs-d5f6ff99c2b594919931b277a2d94d3a289ca764.zip | |
Quieten without-x org compilation
* lisp/org/org.el (image-refresh):
* lisp/org/ox-odt.el (clear-image-cache, image-size): Declare.
| -rw-r--r-- | lisp/org/org.el | 5 | ||||
| -rw-r--r-- | lisp/org/ox-odt.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index 4e4620549c5..2f60a075055 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -19316,6 +19316,9 @@ INCLUDE-LINKED is passed to `org-display-inline-images'." | |||
| 19316 | (org-toggle-inline-images) | 19316 | (org-toggle-inline-images) |
| 19317 | (org-toggle-inline-images))) | 19317 | (org-toggle-inline-images))) |
| 19318 | 19318 | ||
| 19319 | ;; For without-x builds. | ||
| 19320 | (declare-function image-refresh "image" (spec &optional frame)) | ||
| 19321 | |||
| 19319 | (defun org-display-inline-images (&optional include-linked refresh beg end) | 19322 | (defun org-display-inline-images (&optional include-linked refresh beg end) |
| 19320 | "Display inline images. | 19323 | "Display inline images. |
| 19321 | 19324 | ||
| @@ -22905,7 +22908,7 @@ matches in paragraphs or comments, use it." | |||
| 22905 | (match-string 0) | 22908 | (match-string 0) |
| 22906 | ""))))))))))) | 22909 | ""))))))))))) |
| 22907 | 22910 | ||
| 22908 | (declare-function message-goto-body "message" ()) | 22911 | (declare-function message-goto-body "message" (&optional interactive)) |
| 22909 | (defvar message-cite-prefix-regexp) ; From message.el | 22912 | (defvar message-cite-prefix-regexp) ; From message.el |
| 22910 | 22913 | ||
| 22911 | (defun org-fill-element (&optional justify) | 22914 | (defun org-fill-element (&optional justify) |
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el index cdee568fc81..1fc697a6a86 100644 --- a/lisp/org/ox-odt.el +++ b/lisp/org/ox-odt.el | |||
| @@ -2192,6 +2192,10 @@ SHORT-CAPTION are strings." | |||
| 2192 | (org-odt-create-manifest-file-entry media-type target-file) | 2192 | (org-odt-create-manifest-file-entry media-type target-file) |
| 2193 | target-file)) | 2193 | target-file)) |
| 2194 | 2194 | ||
| 2195 | ;; For --without-x builds. | ||
| 2196 | (declare-function clear-image-cache "image.c" (&optional filter)) | ||
| 2197 | (declare-function image-size "image.c" (spec &optional pixels frame)) | ||
| 2198 | |||
| 2195 | (defun org-odt--image-size | 2199 | (defun org-odt--image-size |
| 2196 | (file info &optional user-width user-height scale dpi embed-as) | 2200 | (file info &optional user-width user-height scale dpi embed-as) |
| 2197 | (let* ((--pixels-to-cms | 2201 | (let* ((--pixels-to-cms |