lisp/gnus/gnus-sum.el (gnus-summary-make-menu-bar): Add "Display HTML images" to...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 724112fe3a58788cbf846a0af4aa2be012230dec..574b2e825c6bd2d748201f57e23e2229b20719db 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-28  Adam Sjøgren  <asjo@koldfront.dk>
+
+       * gnus-sum.el (gnus-summary-make-menu-bar): Add "Display HTML images"
+       to "Display" menu.
+
 2015-03-24  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
        * nnimap.el (nnimap-split-incoming-mail): If a message is already

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5de4b5829ce1cfbd0f10105545019e7c89980a74..19da2cce42f3dba17cc04287aa875149ed58d0c4 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7210,6 +7210,8 @@ If given a prefix, show the hidden text instead."
          (set-buffer buf))))))
 
 (defun gnus-block-private-groups (group)
+  "Allows images in newsgroups to be shown, blocks images in all
+other groups."
   (if (or (gnus-news-group-p group)
          (gnus-member-of-valid 'global group))
       ;; Block nothing in news groups.

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 66b1050acc44e5d2a4786c16fe2de2c8ddf7a6e0..c68d4962636614700b049d41c4f97736aeb0d01a 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2424,6 +2424,7 @@ increase the score of each group you read."
              ["Lapsed" gnus-article-date-lapsed t]
              ["User-defined" gnus-article-date-user t])
             ("Display"
+             ["Display HTML images" gnus-article-show-images t]
              ["Remove images" gnus-article-remove-images t]
              ["Toggle smiley" gnus-treat-smiley t]
              ["Show X-Face" gnus-article-display-x-face t]