Accept the moronic openssl s_client -starttls output, too.

[gnus] / lisp / gnus-html.el

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index b411f6c..4bac528 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -30,19 +30,25 @@
 
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'mm-decode))
+
+(require 'gnus-art)
 (require 'mm-url)
+(require 'url)
+(require 'url-cache)
+(require 'xml)
+(require 'browse-url)
 
-(defcustom gnus-html-cache-directory (nnheader-concat gnus-directory "html-cache/")
-  "Where Gnus will cache images it downloads from the web."
+(defcustom gnus-html-image-cache-ttl (days-to-time 7)
+  "Time used to determine if we should use images from the cache."
   :version "24.1"
   :group 'gnus-art
-  :type 'directory)
+  :type 'integer)
 
-(defcustom gnus-html-cache-size 500000000
-  "The size of the Gnus image cache."
+(defcustom gnus-html-image-automatic-caching t
+  "Whether automatically cache retrieve images."
   :version "24.1"
   :group 'gnus-art
-  :type 'integer)
+  :type 'boolean)
 
 (defcustom gnus-html-frame-width 70
   "What width to use when rendering HTML."
@@ -56,7 +62,7 @@
   :group 'gnus-art
   :type 'regexp)
 
-(defcustom gnus-max-image-proportion 0.7
+(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
 width and height of the window.  If they are larger than this,
@@ -70,14 +76,58 @@ fit these criteria."
   (let ((map (make-sparse-keymap)))
     (define-key map "u" 'gnus-article-copy-string)
     (define-key map "i" 'gnus-html-insert-image)
+    (define-