summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-05-08 20:13:47 -0400
committerGlenn Morris <rgm@gnu.org>2015-05-08 20:13:47 -0400
commit5b0af214c81666decaf9cebf191a213d205d8a45 (patch)
tree49a7caae09cfea07d1c507c0e22d5d9fa1d5836f
parente13e72a27962acc93e7d86afba1ed15363c5229e (diff)
Quieten compilation, eg in --without-x builds.
* lisp/dired-aux.el (lpr-printer-switch): * lisp/frame.el (tool-bar-height): * lisp/linum.el (font-info): * lisp/window.el (font-info, overflow-newline-into-fringe) (tool-bar-height): * lisp/emacs-lisp/package-x.el (tar-data-buffer): * lisp/gnus/gnus-util.el (iswitchb-mode): * lisp/mail/rmailmm.el (libxml-parse-html-region): * lisp/net/nsm.el (gnutls-peer-status) (gnutls-peer-status-warning-describe): * lisp/net/shr.el (libxml-parse-xml-region): * lisp/url/url-http.el (gnutls-peer-status): Declare.
-rw-r--r--lisp/dired-aux.el2
-rw-r--r--lisp/emacs-lisp/package-x.el1
-rw-r--r--lisp/frame.el1
-rw-r--r--lisp/gnus/gnus-util.el1
-rw-r--r--lisp/linum.el3
-rw-r--r--lisp/mail/rmailmm.el14
-rw-r--r--lisp/net/nsm.el5
-rw-r--r--lisp/net/shr.el3
-rw-r--r--lisp/url/url-http.el2
-rw-r--r--lisp/window.el6
10 files changed, 33 insertions, 5 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b4e2dc0a93..f7b2a5c53b 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -413,6 +413,8 @@ into the minibuffer."
;; Now the original list FILES has been put back as it was.
(nconc past pending))))
+(defvar lpr-printer-switch)
+
;;;###autoload
(defun dired-do-print (&optional arg)
"Print the marked (or next ARG) files.
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index 6955ce8f5a..81d0b83472 100644
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -156,6 +156,7 @@ DESCRIPTION is the text of the news item."
archive-url))
(declare-function lm-commentary "lisp-mnt" (&optional file))
+(defvar tar-data-buffer)
(defun package-upload-buffer-internal (pkg-desc extension &optional archive-url)
"Upload a package whose contents are in the current buffer.
diff --git a/lisp/frame.el b/lisp/frame.el
index e8a89828b8..0c1fb38c51 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -217,6 +217,7 @@ This function runs the hook `focus-out-hook'."
"Non-nil means function `frame-notice-user-settings' wasn't run yet.")
(declare-function tool-bar-mode "tool-bar" (&optional arg))
+(declare-function tool-bar-height "xdisp.c" (&optional frame pixelwise))
(defalias 'tool-bar-lines-needed 'tool-bar-height)
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 4b06cc0041..b75d9efe5e 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1578,6 +1578,7 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
(prompt &optional default require-match
_predicate start matches-set))
(defvar iswitchb-temp-buflist)
+(defvar iswitchb-mode)
(defun gnus-iswitchb-completing-read (prompt collection &optional require-match
initial-input history def)
diff --git a/lisp/linum.el b/lisp/linum.el
index de15274314..2aac13ab9b 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -138,6 +138,9 @@ Linum mode is a buffer-local minor mode."
(mapc #'delete-overlay linum-available)
(setq linum-available nil))))
+;; Behind display-graphic-p test.
+(declare-function font-info "font.c" (name &optional frame))
+
(defun linum--face-width (face)
(let ((info (font-info (face-font face)))
width)
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 00fc25dd44..3dd57b9bab 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -135,9 +135,10 @@ automatically display the image in the buffer."
(cond ((fboundp 'libxml-parse-html-region) 'rmail-mime-render-html-shr)
((executable-find "lynx") 'rmail-mime-render-html-lynx)
(t nil))
- "Function to convert HTML to text. Called with buffer containing HTML
-extracted from message in a temporary buffer. Converts to text in current
-buffer. If NIL, display HTML source."
+ "Function to convert HTML to text.
+Called with buffer containing HTML extracted from message in a
+temporary buffer. Converts to text in current buffer. If nil,
+display HTML source."
:group 'rmail
:version "25.1"
:type '(choice function (const nil)))
@@ -705,6 +706,9 @@ HEADER is a header component of a MIME-entity object (see
(insert-buffer-substring source-buffer))
(rmail-mime-fix-inserted-faces start)))))))
+(declare-function libxml-parse-html-region "xml.c"
+ (start end &optional base-url discard-comments))
+
(defun rmail-mime-render-html-shr (source-buffer)
(let ((dom (with-current-buffer source-buffer
(libxml-parse-html-region (point-min) (point-max))))
@@ -732,12 +736,12 @@ HEADER is a header component of a MIME-entity object (see
(defun rmail-mime-fix-inserted-faces (start)
(while (< start (point))
(let ((face (get-text-property start 'face))
- (next (next-single-property-change
+ (next (next-single-property-change
start 'face (current-buffer) (point))))
(if face ; anything to do?
(put-text-property start next 'font-lock-face face))
(setq start next))))
-
+
(defun rmail-mime-toggle-button (button)
"Hide or show the body of the MIME-entity associated with BUTTON."
(save-excursion
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 28253e5bdf..261e5a1a36 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -76,6 +76,8 @@ stored in plain text."
"If non-nil, the connection is opened in a non-interactive context.
This means that no queries should be performed.")
+(declare-function gnutls-peer-status "gnutls.c" (proc))
+
(defun nsm-verify-connection (process host port &optional
save-fingerprint warn-unencrypted)
"Verify the security status of PROCESS that's connected to HOST:PORT.
@@ -122,6 +124,9 @@ unencrypted."
(nsm-check-protocol process host port status settings)
process)))
+(declare-function gnutls-peer-status-warning-describe "gnutls.c"
+ (status-symbol))
+
(defun nsm-check-certificate (process host port status settings)
(let ((warnings (plist-get status :warnings)))
(cond
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index f17ef8ef93..0ce77b9055 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -949,6 +949,9 @@ Return a string with image data."
(search-forward "\r\n\r\n" nil t))
(shr-parse-image-data)))))
+(declare-function libxml-parse-xml-region "xml.c"
+ (start end &optional base-url discard-comments))
+
(defun shr-parse-image-data ()
(let ((data (buffer-substring (point) (point-max)))
(content-type
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index d766952ebf..6a7d8e2c94 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -485,6 +485,8 @@ work correctly."
)
)
+(declare-function gnutls-peer-status "gnutls.c" (proc))
+
(defun url-http-parse-headers ()
"Parse and handle HTTP specific headers.
Return t if and only if the current buffer is still active and
diff --git a/lisp/window.el b/lisp/window.el
index a6c60e9805..49b7e2cc55 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1835,6 +1835,8 @@ optional argument PIXELWISE is passed to the functions."
(window-body-width window pixelwise)
(window-body-height window pixelwise)))
+(declare-function font-info "font.c" (name &optional frame))
+
(defun window-font-width (&optional window face)
"Return average character width for the font of FACE used in WINDOW.
WINDOW must be a live window and defaults to the selected one.
@@ -1866,6 +1868,8 @@ information for the remapped face."
(aref info 3))
(frame-char-height))))
+(defvar overflow-newline-into-fringe)
+
(defun window-max-chars-per-line (&optional window face)
"Return the number of characters that can be displayed on one line in WINDOW.
WINDOW must be a live window and defaults to the selected one.
@@ -7187,6 +7191,8 @@ See also `fit-frame-to-buffer-margins'."
(<= left (- right margin)) (<= margin right))
margin))
+(declare-function tool-bar-height "xdisp.c" (&optional frame pixelwise))
+
(defun fit-frame-to-buffer (&optional frame max-height min-height max-width min-width only)
"Adjust size of FRAME to display the contents of its buffer exactly.
FRAME can be any live frame and defaults to the selected one.