[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d5f6ff9: Quieten without-x org compilation
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master d5f6ff9: Quieten without-x org compilation |
Date: |
Wed, 28 Feb 2018 16:55:52 -0500 (EST) |
branch: master
commit d5f6ff99c2b594919931b277a2d94d3a289ca764
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Quieten without-x org compilation
* lisp/org/org.el (image-refresh):
* lisp/org/ox-odt.el (clear-image-cache, image-size): Declare.
---
lisp/org/org.el | 5 ++++-
lisp/org/ox-odt.el | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 4e46205..2f60a07 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -19316,6 +19316,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.
@@ -22905,7 +22908,7 @@ matches in paragraphs or comments, use it."
(match-string 0)
"")))))))))))
-(declare-function message-goto-body "message" ())
+(declare-function message-goto-body "message" (&optional interactive))
(defvar message-cite-prefix-regexp) ; From message.el
(defun org-fill-element (&optional justify)
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index cdee568..1fc697a 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -2192,6 +2192,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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d5f6ff9: Quieten without-x org compilation,
Glenn Morris <=