[gnus git] branch master updated: m0-9-68-gb6bd619 =1= (mml-generate-mime): Don't bug out if you don't have libxml.

Lars Ingebrigtsen <[email protected]> Thu, 06 Mar 2014 20:31:06 +0100
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  b6bd61909a3d4117db40e6a802e88fae3dede67b (commit)
      from  99648d27eedbdead431411bfa31edd18c4ad5db4 (commit)


- Log -----------------------------------------------------------------
commit b6bd61909a3d4117db40e6a802e88fae3dede67b
Author: Lars Ingebrigtsen <[email protected]>
Date:   Thu Mar 6 20:29:07 2014 +0100

    (mml-generate-mime): Don't bug out if you don't have libxml.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffaa2da..e00479b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
 	* mml.el (mml-expand-html-into-multipart-related): Allow sending HTML
 	messages with embedded images.
+	(mml-generate-mime): Don't bug out if you don't have libxml.
 
 2014-03-06  Lars Ingebrigtsen  <[email protected]>
 
diff --git a/lisp/mml.el b/lisp/mml.el
index e38cfcf..168fe49 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -459,6 +459,9 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 (defvar mml-multipart-number 0)
 (defvar mml-inhibit-compute-boundary nil)
 
+(declare-function libxml-parse-html-region "xml.c"
+		  (start end &optional base-url))
+
 (defun mml-generate-mime (&optional multipart-type)
   "Generate a MIME message based on the current MML document.
 MULTIPART-TYPE defaults to \"mixed\", but can also
@@ -470,6 +473,7 @@ be \"related\" or \"alternate\"."
 	nil
       (when (and (consp (car cont))
 		 (= (length cont) 1)
+		 (fboundp 'libxml-parse-html-region)
 		 (equal (cdr (assq 'type (car cont))) "text/html"))
 	(setq cont (mml-expand-html-into-multipart-related (car cont))))
       (prog1

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    1 +
 lisp/mml.el    |    4 ++++
 2 files changed, 5 insertions(+)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project