gnus-html.el: Add the new command gnus-html-show-images.

5 files changed, 28 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c97688438c6..a4a68336aa9 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,4 +1,9 @@
+2010-09-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Article Display): Document gnus-html-show-images.
+
 2010-09-02  Jan Djärv  <jan.h.d@swipnet.se>
+
         * cl.texi (Basic Setf): Remove x-get-cut-buffer and x-get-cutbuffer.
 
 2010-09-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a8f379c5b1a..115a3548692 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -10351,6 +10351,14 @@ Piconify all news headers (i. e., @code{Newsgroups} and
 Remove all images from the article buffer
 (@code{gnus-article-remove-images}).
 
+@item W D W
+@kindex W D W (Summary)
+@findex gnus-html-show-images
+If you're reading an @acronym{HTML} article rendered with
+@code{gnus-article-html}, then you can insert any blocked images in
+the buffer with this command.
+(@code{gnus-html-show-images}).
+
 @end table
 
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8e593d72e65..922cef18b8f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -3,6 +3,8 @@
         * gnus-html.el (gnus-html-put-image): Allow images to be removed.
         (gnus-html-wash-tags): Add a new `i' command to insert images.
         (gnus-html-insert-image): New command and keystroke.
+        (gnus-html-redisplay-with-images): New command and keystroke.
+        (gnus-html-show-images): Renamed command.
 
         * gnus-agent.el (gnus-agent-auto-agentize-methods): Change the default
         so that nnimap methods aren't agentized by default.  There's apparently
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index a42cd9309b5..c0e0ed73391 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -362,6 +362,18 @@ fit these criteria."
                     url blocked-images))
     ret))
 
+(defun gnus-html-show-images ()
+  "Show any images that are in the HTML-rendered article buffer.
+This only works if the article in question is HTML."
+  (interactive)
+  (gnus-with-article-buffer
+    (let ((overlays (overlays-in (point-min) (point-max)))
+          overlay images)
+      (while (setq overlay (pop overlays))
+        (when (overlay-get overlay 'gnus-image)
+          (push (overlay-get overlay 'gnus-image) images)))
+      (gnus-html-schedule-image-fetching (current-buffer) images))))
+
 ;;;###autoload
 (defun gnus-html-prefetch-images (summary)
   (let (blocked-images urls)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index f1ea15dff9b..37cf4a11472 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2110,6 +2110,7 @@ increase the score of each group you read."
   "d" gnus-article-display-face
   "s" gnus-treat-smiley
   "D" gnus-article-remove-images
+  "W" gnus-html-show-images
   "f" gnus-treat-from-picon
   "m" gnus-treat-mail-picon
   "n" gnus-treat-newsgroups-picon)