From: Glenn Morris <rgm@gnu.org>
Date: Tue, 18 Jun 2013 08:51:57 +0000 (+0000)
Subject: Merge changes made in Emacs trunk
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=26c3b2dde98792a08f156f68542767c99554c7f0

Merge changes made in Emacs trunk

mm-decode.el (widget-convert-button): Autoload.
sieve-manage.el (mm-enable-multibyte): Autoload.
shr.el (libxml-parse-html-region): Declare.
(shr-render-buffer): Explicit error if no libxml2 support.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3cf303a71..5ad1ddbad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2013-06-18  Glenn Morris  <rgm@gnu.org>
+
+	* mm-decode.el (widget-convert-button): Autoload.
+
+	* sieve-manage.el (mm-enable-multibyte): Autoload.
+
+	* shr.el (libxml-parse-html-region): Declare.
+	(shr-render-buffer): Explicit error if no libxml2 support.
+
 2013-06-17  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* auth-source.el (auth-source-current-line): New function.
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 971c26e20..98be1c5de 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1819,6 +1819,8 @@ If RECURSIVE, search recursively."
 
 (defvar shr-map)
 
+(autoload 'widget-convert-button "wid-edit")
+
 (defun mm-convert-shr-links ()
   (let ((start (point-min))
 	end)
diff --git a/lisp/shr.el b/lisp/shr.el
index 2d0c9107f..06abde9e3 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -142,10 +142,14 @@ cid: URL as the argument.")
     map))
 
 ;; Public functions and commands.
+(declare-function libxml-parse-html-region "xml.c"
+		  (start end &optional base-url))
 
 (defun shr-render-buffer (buffer)
   "Display the HTML rendering of the current buffer."
   (interactive (list (current-buffer)))
+  (or (fboundp 'libxml-parse-html-region)
+      (error "This function requires Emacs to be compiled with libxml2"))
   (pop-to-buffer "*html*")
   (erase-buffer)
   (shr-insert-document
diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index 6588f717b..4221276e2 100644
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -168,6 +168,8 @@ Valid states are `closed', `initial', `nonauth', and `auth'.")
 (defvar sieve-manage-capability nil)
 
 ;; Internal utility functions
+(autoload 'mm-enable-multibyte "mm-util")
+
 (defun sieve-manage-make-process-buffer ()
   (with-current-buffer
       (generate-new-buffer (format " *sieve %s:%s*"