From: Glenn Morris <rgm@gnu.org>
Date: Wed, 18 Sep 2013 04:48:55 +0000 (-0700)
Subject: * net/eww.el (libxml-parse-html-region): Declare.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1546
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5148da153e385332f3fc87ace4bf4c2fc580b41e;p=emacs.git

* net/eww.el (libxml-parse-html-region): Declare.
(eww-display-html): Explicit error if no libxml2 support.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd6d8f0a547..96f2702f984 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-09-18  Glenn Morris  <rgm@gnu.org>
 
+	* net/eww.el (libxml-parse-html-region): Declare.
+	(eww-display-html): Explicit error if no libxml2 support.
+
 	* doc-view.el (doc-view-mode): Silence --without-x compilation.
 
 	* image.el (image-type-from-buffer, image-multi-frame-p):
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 6cf4ff2c9bf..e67d9c5a25c 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -197,7 +197,12 @@ word(s) will be searched for via `eww-search-prefix'."
 	      "[\t\n\r ]*<\\?xml[\t\n\r ]+[^>]*encoding=\"\\([^\"]+\\)")
 	     (match-string 1)))))
 
+(declare-function libxml-parse-html-region "xml.c"
+		  (start end &optional base-url))
+
 (defun eww-display-html (charset url)
+  (or (fboundp 'libxml-parse-html-region)
+      (error "This function requires Emacs to be compiled with libxml2"))
   (unless (eq charset 'utf8)
     (condition-case nil
 	(decode-coding-region (point) (point-max) charset)