* gnus-art.el (gnus-blocked-images): Move variable here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00bfaac..44f89d7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-art.el (gnus-blocked-images): Move variable here.
+
        * shr.el (shr-insert-table): Bind free variable.
 
        * mm-decode.el (mm-shr): Bind shr-content-function.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index d96df61..d7dcf90 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1639,6 +1639,12 @@ This requires GNU Libidn, and by default only enabled if it is found."
   :group 'gnus-article
   :type 'boolean)
 
+(defcustom gnus-blocked-images "."
+  "Images that have URLs matching this regexp will be blocked."
+  :version "24.1"
+  :group 'gnus-art
+  :type 'regexp)
+
 ;;; Internal variables
 
 (defvar gnus-english-month-names

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index d30b574..873d4b4 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -57,12 +57,6 @@
   :group 'gnus-art
   :type 'integer)
 
-(defcustom gnus-blocked-images "."
-  "Images that have URLs matching this regexp will be blocked."
-  :version "24.1"
-  :group 'gnus-art
-  :type 'regexp)
-
 (defcustom gnus-max-image-proportion 0.9
   "How big pictures displayed are in relation to the window they're in.
 A value of 0.7 means that they are allowed to take up 70% of the