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 /lisp/mail | |
| 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.
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/rmailmm.el | 14 |
1 files changed, 9 insertions, 5 deletions
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 |