diff options
| author | Glenn Morris | 2015-05-08 20:13:47 -0400 |
|---|---|---|
| committer | Glenn Morris | 2015-05-08 20:13:47 -0400 |
| commit | 5b0af214c81666decaf9cebf191a213d205d8a45 (patch) | |
| tree | 49a7caae09cfea07d1c507c0e22d5d9fa1d5836f | |
| parent | e13e72a27962acc93e7d86afba1ed15363c5229e (diff) | |
| download | emacs-5b0af214c81666decaf9cebf191a213d205d8a45.tar.gz emacs-5b0af214c81666decaf9cebf191a213d205d8a45.zip | |
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.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package-x.el | 1 | ||||
| -rw-r--r-- | lisp/frame.el | 1 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 1 | ||||
| -rw-r--r-- | lisp/linum.el | 3 | ||||
| -rw-r--r-- | lisp/mail/rmailmm.el | 14 | ||||
| -rw-r--r-- | lisp/net/nsm.el | 5 | ||||
| -rw-r--r-- | lisp/net/shr.el | 3 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 2 | ||||
| -rw-r--r-- | lisp/window.el | 6 |
10 files changed, 33 insertions, 5 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index b4e2dc0a937..f7b2a5c53b3 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el | |||
| @@ -413,6 +413,8 @@ into the minibuffer." | |||
| 413 | ;; Now the original list FILES has been put back as it was. | 413 | ;; Now the original list FILES has been put back as it was. |
| 414 | (nconc past pending)))) | 414 | (nconc past pending)))) |
| 415 | 415 | ||
| 416 | (defvar lpr-printer-switch) | ||
| 417 | |||
| 416 | ;;;###autoload | 418 | ;;;###autoload |
| 417 | (defun dired-do-print (&optional arg) | 419 | (defun dired-do-print (&optional arg) |
| 418 | "Print the marked (or next ARG) files. | 420 | "Print the marked (or next ARG) files. |
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el index 6955ce8f5a6..81d0b834722 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." | |||
| 156 | archive-url)) | 156 | archive-url)) |
| 157 | 157 | ||
| 158 | (declare-function lm-commentary "lisp-mnt" (&optional file)) | 158 | (declare-function lm-commentary "lisp-mnt" (&optional file)) |
| 159 | (defvar tar-data-buffer) | ||
| 159 | 160 | ||
| 160 | (defun package-upload-buffer-internal (pkg-desc extension &optional archive-url) | 161 | (defun package-upload-buffer-internal (pkg-desc extension &optional archive-url) |
| 161 | "Upload a package whose contents are in the current buffer. | 162 | "Upload a package whose contents are in the current buffer. |
diff --git a/lisp/frame.el b/lisp/frame.el index e8a89828b8d..0c1fb38c516 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -217,6 +217,7 @@ This function runs the hook `focus-out-hook'." | |||
| 217 | "Non-nil means function `frame-notice-user-settings' wasn't run yet.") | 217 | "Non-nil means function `frame-notice-user-settings' wasn't run yet.") |
| 218 | 218 | ||
| 219 | (declare-function tool-bar-mode "tool-bar" (&optional arg)) | 219 | (declare-function tool-bar-mode "tool-bar" (&optional arg)) |
| 220 | (declare-function tool-bar-height "xdisp.c" (&optional frame pixelwise)) | ||
| 220 | 221 | ||
| 221 | (defalias 'tool-bar-lines-needed 'tool-bar-height) | 222 | (defalias 'tool-bar-lines-needed 'tool-bar-height) |
| 222 | 223 | ||
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 4b06cc00416..b75d9efe5e5 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', | |||
| 1578 | (prompt &optional default require-match | 1578 | (prompt &optional default require-match |
| 1579 | _predicate start matches-set)) | 1579 | _predicate start matches-set)) |
| 1580 | (defvar iswitchb-temp-buflist) | 1580 | (defvar iswitchb-temp-buflist) |
| 1581 | (defvar iswitchb-mode) | ||
| 1581 | 1582 | ||
| 1582 | (defun gnus-iswitchb-completing-read (prompt collection &optional require-match | 1583 | (defun gnus-iswitchb-completing-read (prompt collection &optional require-match |
| 1583 | initial-input history def) | 1584 | initial-input history def) |
diff --git a/lisp/linum.el b/lisp/linum.el index de15274314c..2aac13ab9b0 100644 --- a/lisp/linum.el +++ b/lisp/linum.el | |||
| @@ -138,6 +138,9 @@ Linum mode is a buffer-local minor mode." | |||
| 138 | (mapc #'delete-overlay linum-available) | 138 | (mapc #'delete-overlay linum-available) |
| 139 | (setq linum-available nil)))) | 139 | (setq linum-available nil)))) |
| 140 | 140 | ||
| 141 | ;; Behind display-graphic-p test. | ||
| 142 | (declare-function font-info "font.c" (name &optional frame)) | ||
| 143 | |||
| 141 | (defun linum--face-width (face) | 144 | (defun linum--face-width (face) |
| 142 | (let ((info (font-info (face-font face))) | 145 | (let ((info (font-info (face-font face))) |
| 143 | width) | 146 | width) |
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index 00fc25dd440..3dd57b9bab7 100644 --- a/lisp/mail/rmailmm.el +++ b/lisp/mail/rmailmm.el | |||
| @@ -135,9 +135,10 @@ automatically display the image in the buffer." | |||
| 135 | (cond ((fboundp 'libxml-parse-html-region) 'rmail-mime-render-html-shr) | 135 | (cond ((fboundp 'libxml-parse-html-region) 'rmail-mime-render-html-shr) |
| 136 | ((executable-find "lynx") 'rmail-mime-render-html-lynx) | 136 | ((executable-find "lynx") 'rmail-mime-render-html-lynx) |
| 137 | (t nil)) | 137 | (t nil)) |
| 138 | "Function to convert HTML to text. Called with buffer containing HTML | 138 | "Function to convert HTML to text. |
| 139 | extracted from message in a temporary buffer. Converts to text in current | 139 | Called with buffer containing HTML extracted from message in a |
| 140 | buffer. If NIL, display HTML source." | 140 | temporary buffer. Converts to text in current buffer. If nil, |
| 141 | display HTML source." | ||
| 141 | :group 'rmail | 142 | :group 'rmail |
| 142 | :version "25.1" | 143 | :version "25.1" |
| 143 | :type '(choice function (const nil))) | 144 | :type '(choice function (const nil))) |
| @@ -705,6 +706,9 @@ HEADER is a header component of a MIME-entity object (see | |||
| 705 | (insert-buffer-substring source-buffer)) | 706 | (insert-buffer-substring source-buffer)) |
| 706 | (rmail-mime-fix-inserted-faces start))))))) | 707 | (rmail-mime-fix-inserted-faces start))))))) |
| 707 | 708 | ||
| 709 | (declare-function libxml-parse-html-region "xml.c" | ||
| 710 | (start end &optional base-url discard-comments)) | ||
| 711 | |||
| 708 | (defun rmail-mime-render-html-shr (source-buffer) | 712 | (defun rmail-mime-render-html-shr (source-buffer) |
| 709 | (let ((dom (with-current-buffer source-buffer | 713 | (let ((dom (with-current-buffer source-buffer |
| 710 | (libxml-parse-html-region (point-min) (point-max)))) | 714 | (libxml-parse-html-region (point-min) (point-max)))) |
| @@ -732,12 +736,12 @@ HEADER is a header component of a MIME-entity object (see | |||
| 732 | (defun rmail-mime-fix-inserted-faces (start) | 736 | (defun rmail-mime-fix-inserted-faces (start) |
| 733 | (while (< start (point)) | 737 | (while (< start (point)) |
| 734 | (let ((face (get-text-property start 'face)) | 738 | (let ((face (get-text-property start 'face)) |
| 735 | (next (next-single-property-change | 739 | (next (next-single-property-change |
| 736 | start 'face (current-buffer) (point)))) | 740 | start 'face (current-buffer) (point)))) |
| 737 | (if face ; anything to do? | 741 | (if face ; anything to do? |
| 738 | (put-text-property start next 'font-lock-face face)) | 742 | (put-text-property start next 'font-lock-face face)) |
| 739 | (setq start next)))) | 743 | (setq start next)))) |
| 740 | 744 | ||
| 741 | (defun rmail-mime-toggle-button (button) | 745 | (defun rmail-mime-toggle-button (button) |
| 742 | "Hide or show the body of the MIME-entity associated with BUTTON." | 746 | "Hide or show the body of the MIME-entity associated with BUTTON." |
| 743 | (save-excursion | 747 | (save-excursion |
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index 28253e5bdf5..261e5a1a36c 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el | |||
| @@ -76,6 +76,8 @@ stored in plain text." | |||
| 76 | "If non-nil, the connection is opened in a non-interactive context. | 76 | "If non-nil, the connection is opened in a non-interactive context. |
| 77 | This means that no queries should be performed.") | 77 | This means that no queries should be performed.") |
| 78 | 78 | ||
| 79 | (declare-function gnutls-peer-status "gnutls.c" (proc)) | ||
| 80 | |||
| 79 | (defun nsm-verify-connection (process host port &optional | 81 | (defun nsm-verify-connection (process host port &optional |
| 80 | save-fingerprint warn-unencrypted) | 82 | save-fingerprint warn-unencrypted) |
| 81 | "Verify the security status of PROCESS that's connected to HOST:PORT. | 83 | "Verify the security status of PROCESS that's connected to HOST:PORT. |
| @@ -122,6 +124,9 @@ unencrypted." | |||
| 122 | (nsm-check-protocol process host port status settings) | 124 | (nsm-check-protocol process host port status settings) |
| 123 | process))) | 125 | process))) |
| 124 | 126 | ||
| 127 | (declare-function gnutls-peer-status-warning-describe "gnutls.c" | ||
| 128 | (status-symbol)) | ||
| 129 | |||
| 125 | (defun nsm-check-certificate (process host port status settings) | 130 | (defun nsm-check-certificate (process host port status settings) |
| 126 | (let ((warnings (plist-get status :warnings))) | 131 | (let ((warnings (plist-get status :warnings))) |
| 127 | (cond | 132 | (cond |
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index f17ef8ef934..0ce77b9055c 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el | |||
| @@ -949,6 +949,9 @@ Return a string with image data." | |||
| 949 | (search-forward "\r\n\r\n" nil t)) | 949 | (search-forward "\r\n\r\n" nil t)) |
| 950 | (shr-parse-image-data))))) | 950 | (shr-parse-image-data))))) |
| 951 | 951 | ||
| 952 | (declare-function libxml-parse-xml-region "xml.c" | ||
| 953 | (start end &optional base-url discard-comments)) | ||
| 954 | |||
| 952 | (defun shr-parse-image-data () | 955 | (defun shr-parse-image-data () |
| 953 | (let ((data (buffer-substring (point) (point-max))) | 956 | (let ((data (buffer-substring (point) (point-max))) |
| 954 | (content-type | 957 | (content-type |
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index d766952ebf3..6a7d8e2c947 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el | |||
| @@ -485,6 +485,8 @@ work correctly." | |||
| 485 | ) | 485 | ) |
| 486 | ) | 486 | ) |
| 487 | 487 | ||
| 488 | (declare-function gnutls-peer-status "gnutls.c" (proc)) | ||
| 489 | |||
| 488 | (defun url-http-parse-headers () | 490 | (defun url-http-parse-headers () |
| 489 | "Parse and handle HTTP specific headers. | 491 | "Parse and handle HTTP specific headers. |
| 490 | Return t if and only if the current buffer is still active and | 492 | Return t if and only if the current buffer is still active and |
diff --git a/lisp/window.el b/lisp/window.el index a6c60e9805d..49b7e2cc55d 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -1835,6 +1835,8 @@ optional argument PIXELWISE is passed to the functions." | |||
| 1835 | (window-body-width window pixelwise) | 1835 | (window-body-width window pixelwise) |
| 1836 | (window-body-height window pixelwise))) | 1836 | (window-body-height window pixelwise))) |
| 1837 | 1837 | ||
| 1838 | (declare-function font-info "font.c" (name &optional frame)) | ||
| 1839 | |||
| 1838 | (defun window-font-width (&optional window face) | 1840 | (defun window-font-width (&optional window face) |
| 1839 | "Return average character width for the font of FACE used in WINDOW. | 1841 | "Return average character width for the font of FACE used in WINDOW. |
| 1840 | WINDOW must be a live window and defaults to the selected one. | 1842 | WINDOW must be a live window and defaults to the selected one. |
| @@ -1866,6 +1868,8 @@ information for the remapped face." | |||
| 1866 | (aref info 3)) | 1868 | (aref info 3)) |
| 1867 | (frame-char-height)))) | 1869 | (frame-char-height)))) |
| 1868 | 1870 | ||
| 1871 | (defvar overflow-newline-into-fringe) | ||
| 1872 | |||
| 1869 | (defun window-max-chars-per-line (&optional window face) | 1873 | (defun window-max-chars-per-line (&optional window face) |
| 1870 | "Return the number of characters that can be displayed on one line in WINDOW. | 1874 | "Return the number of characters that can be displayed on one line in WINDOW. |
| 1871 | WINDOW must be a live window and defaults to the selected one. | 1875 | WINDOW must be a live window and defaults to the selected one. |
| @@ -7187,6 +7191,8 @@ See also `fit-frame-to-buffer-margins'." | |||
| 7187 | (<= left (- right margin)) (<= margin right)) | 7191 | (<= left (- right margin)) (<= margin right)) |
| 7188 | margin)) | 7192 | margin)) |
| 7189 | 7193 | ||
| 7194 | (declare-function tool-bar-height "xdisp.c" (&optional frame pixelwise)) | ||
| 7195 | |||
| 7190 | (defun fit-frame-to-buffer (&optional frame max-height min-height max-width min-width only) | 7196 | (defun fit-frame-to-buffer (&optional frame max-height min-height max-width min-width only) |
| 7191 | "Adjust size of FRAME to display the contents of its buffer exactly. | 7197 | "Adjust size of FRAME to display the contents of its buffer exactly. |
| 7192 | FRAME can be any live frame and defaults to the selected one. | 7198 | FRAME can be any live frame and defaults to the selected one. |