gnus-html-image-fetched: Only cache if gnus-html-image-automatic-caching is set

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3aac516..a664363 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-22  Julien Danjou  <julien@danjou.info>
+
+       * gnus-html.el (gnus-html-image-automatic-caching): Add custom
+       variable.
+       (gnus-html-image-fetched): Only cache if
+       gnus-html-image-automatic-caching is set.
+
 2010-09-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-split-incoming-mail): Delete 'junk.

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index f796bde..cb466b3 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -39,11 +39,17 @@
 (require 'browse-url)
 
 (defcustom gnus-html-image-cache-ttl (days-to-time 7)
-  "Time in seconds used to cache the image on disk."
+  "Time used to determine if we should use images from the cache."
   :version "24.1"
   :group 'gnus-art
   :type 'integer)
 
+(defcustom gnus-html-image-automatic-caching t
+  "Whether automatically cache retrieve images."
+  :version "24.1"
+  :group 'gnus-art
+  :type 'boolean)
+
 (defcustom gnus-html-frame-width 70
   "What width to use when rendering HTML."
   :version "24.1"
@@ -345,7 +351,9 @@ Use ALT-TEXT for the image string."
                   (list buffer image))))
 
 (defun gnus-html-image-fetched (status buffer image)
-  (url-store-in-cache (current-buffer))
+  "Callback function called when image has been fetched."
+  (when gnus-html-image-automatic-caching
+    (url-store-in-cache (current-buffer)))
   (when (and (or (search-forward "\n\n" nil t)
                  (search-forward "\r\n\r\n" nil t))
              (buffer-live-p buffer))