merge from upstream

1 files changed, 10 insertions, 8 deletions

diff --git a/src/xml.c b/src/xml.c
index 16907d4b44a..63041c96b24 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -28,11 +28,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "buffer.h"
 
-Lisp_Object make_dom (xmlNode *node)
+static Lisp_Object
+make_dom (xmlNode *node)
 {
   if (node->type == XML_ELEMENT_NODE)
     {
-      Lisp_Object result = Fcons (intern (node->name), Qnil);
+      Lisp_Object result = Fcons (intern ((char *) node->name), Qnil);
       xmlNode *child;
       xmlAttr *property;
       Lisp_Object plist = Qnil;
@@ -44,8 +45,9 @@ Lisp_Object make_dom (xmlNode *node)
           if (property->children &&
               property->children->content)
             {
-              plist = Fcons (Fcons (intern (property->name),
-                                    build_string (property->children->content)),
+              char *content = (char *) property->children->content;
+              plist = Fcons (Fcons (intern ((char *) property->name),
+                                    build_string (content)),
                              plist);
             }
           property = property->next;
@@ -65,7 +67,7 @@ Lisp_Object make_dom (xmlNode *node)
   else if (node->type == XML_TEXT_NODE || node->type == XML_CDATA_SECTION_NODE)
     {
       if (node->content)
-        return build_string (node->content);
+        return build_string ((char *) node->content);
       else
         return Qnil;
     }
@@ -102,16 +104,16 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html
   bytes = CHAR_TO_BYTE (iend) - CHAR_TO_BYTE (istart);
 
   if (htmlp)
-    doc = htmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
+    doc = htmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
                           bytes, burl, "utf-8",
                           HTML_PARSE_RECOVER|HTML_PARSE_NONET|
                           HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR|
                           HTML_PARSE_NOBLANKS);
   else
-    doc = xmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
+    doc = xmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
                          bytes, burl, "utf-8",
                          XML_PARSE_NONET|XML_PARSE_NOWARNING|
-                         XML_PARSE_NOERROR);
+                         XML_PARSE_NOBLANKS |XML_PARSE_NOERROR);
 
   if (doc != NULL)
     {