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

3 files changed, 8 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 724112fe3a5..574b2e825c6 100644
--- 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 5de4b5829ce..19da2cce42f 100644
--- 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 66b1050acc4..c68d4962636 100644
--- 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]