shr: make shr-width a defcustom, use it in shr-tag-img.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c90dc7c77c29490a7aef0ae6969efb7116eb1249..a568a530927deacaef39860b8d9ebe662fc98a4b 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-13  Julien Danjou  <julien@danjou.info>
+
+       * shr.el (shr-width): Make shr-width a defcustom with default to
+       fill-column.
+       (shr-tag-img): Use shr-width rather than fill-column.
+
 2010-10-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-dired.el (gnus-dired-attach): Silence XEmacs 21.5 when compiling.

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 03c0ec84d5d6efa7a4de80c03ca3869985f4afec..8a0e814bca30f82b574c1b4390d23ae649ac623a 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -68,14 +68,16 @@ fit these criteria."
   :group 'shr
   :type 'char)
 
+(defcustom shr-width fill-column
+  "Frame width to use for rendering."
+  :type 'integer
+  :group 'shr)
+
 (defvar shr-content-function nil
   "If bound, this should be a function that will return the content.
 This is used for cid: URLs, and the function is called with the
 cid: URL as the argument.")
 
-(defvar shr-width 70
-  "Frame width to use for rendering.")
-
 ;;; Internal variables.
 
 (defvar shr-folding-mode nil)
@@ -404,7 +406,7 @@ Return a string with image data."
     (when width
       ;; Check that width is not larger than max width, otherwise ignore
       ;; align
-      (let ((max-width (* fill-column (frame-char-width)))
+      (let ((max-width (* shr-width (frame-char-width)))
             (width (string-to-number width)))
         (when (< width max-width)
           (let ((align (cdr (assq :align cont))))