Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25

[gnu-emacs] / lisp / gnus / gnus-async.el

diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index c5d64332547e0ba52c4d083a8209f8bb1e1cc864..a1408259ec5ac7c9a21cc0f574177a3772224886 100644 (file)
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -1,6 +1,6 @@
 ;;; gnus-async.el --- asynchronous support for Gnus
 
-;; Copyright (C) 1996-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -76,7 +76,7 @@ The function will be called narrowed to the region of the article
 that was fetched."
   :version "24.1"
   :group 'gnus-asynchronous
-  :type 'function)
+  :type '(choice (const nil) function))
 
 ;;; Internal variables.
 
@@ -226,9 +226,6 @@ that was fetched."
   `(lambda (arg)
      (gnus-async-article-callback arg ,group ,article ,mark ,summary ,next)))
 
-(eval-when-compile
-  (autoload 'gnus-html-prefetch-images "gnus-html"))
-
 (defun gnus-async-article-callback (arg group article mark summary next)
   "Function called when an async article is done being fetched."
   (save-excursion