changeset 110272:1e4996f96b0b

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 07 Sep 2010 01:25:00 +0000
parents 3133b4a76e7c (current diff) 8a1ec5899552 (diff)
children 63c12314fbd0
files
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Tue Sep 07 00:18:04 2010 +0000
+++ b/lisp/gnus/ChangeLog	Tue Sep 07 01:25:00 2010 +0000
@@ -1,3 +1,8 @@
+2010-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-async.el (gnus-html-prefetch-images): Autoload it when compiling.
+	(gnus-async-article-callback): Fix typo.
+
 2010-09-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-html.el (gnus-html-wash-tags): Limit end-tag matching to the
--- a/lisp/gnus/gnus-async.el	Tue Sep 07 00:18:04 2010 +0000
+++ b/lisp/gnus/gnus-async.el	Tue Sep 07 01:25:00 2010 +0000
@@ -228,6 +228,9 @@
   `(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
@@ -240,7 +243,7 @@
 	    (narrow-to-region mark (point-max))
 	    ;; Prefetch images for the groups that want that.
 	    (when (fboundp 'gnus-html-prefetch-images)
-	      (gnus-async-post-fetch-function summary))
+	      (gnus-html-prefetch-images summary))
 	    (funcall gnus-async-post-fetch-function summary))))
       (gnus-async-with-semaphore
 	(setq