[gnus git] branch master updated: m0-7-119-g26c3b2d =1= Merge changes made in Emacs trunk

       via  26c3b2dde98792a08f156f68542767c99554c7f0 (commit)
      from  0747a49b4012e3667a90a2b9b78a88462b405f16 (commit)


- Log -----------------------------------------------------------------
commit 26c3b2dde98792a08f156f68542767c99554c7f0
Author: Glenn Morris <[email protected]>
Date:   Tue Jun 18 08:51:57 2013 +0000

    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 3cf303a..5ad1ddb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2013-06-18  Glenn Morris  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* auth-source.el (auth-source-current-line): New function.
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 971c26e..98be1c5 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 2d0c910..06abde9 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 6588f71..4221276 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*"

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog       |    9 +++++++++
 lisp/mm-decode.el    |    2 ++
 lisp/shr.el          |    4 ++++
 lisp/sieve-manage.el |    2 ++
 4 files changed, 17 insertions(+), 0 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project