(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 (file)
--- 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.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  <larsi@gnus.org>
 
 
 2014-03-06  Lars Ingebrigtsen  <larsi@gnus.org>
 

diff --git a/lisp/mml.el b/lisp/mml.el
index e38cfcf..168fe49 100644 (file)
--- 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)
 
 (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
 (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)
        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
                 (equal (cdr (assq 'type (car cont))) "text/html"))
        (setq cont (mml-expand-html-into-multipart-related (car cont))))
       (prog1