[Emacs-diffs] trunk r114363: * net/eww.el (libxml-parse-html-region): Declare.

[Glenn Morris]

------------------------------------------------------------
revno: 114363
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 21:48:55 -0700
message:
  * net/eww.el (libxml-parse-html-region): Declare.
  (eww-display-html): Explicit error if no libxml2 support.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-18 04:46:44 +0000
+++ b/lisp/ChangeLog    2013-09-18 04:48:55 +0000
@@ -1,5 +1,8 @@
 2013-09-18  Glenn Morris  <address@hidden>
 
+       * 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):

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-09-05 03:30:07 +0000
+++ b/lisp/net/eww.el   2013-09-18 04:48:55 +0000
@@ -197,7 +197,12 @@
              "[\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)