# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1286970948 0
# Node ID 0272ba632fc2cd10cfa6fd91457b6c1d79e626e1
# Parent  8c6b3fc2a999fb593f6aa177e5b06bc3fd8a34a9
shr: make shr-width a defcustom, use it in shr-tag-img.

diff -r 8c6b3fc2a999 -r 0272ba632fc2 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Oct 13 05:39:17 2010 +0000
+++ b/lisp/gnus/ChangeLog	Wed Oct 13 11:55:48 2010 +0000
@@ -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 -r 8c6b3fc2a999 -r 0272ba632fc2 lisp/gnus/shr.el
--- a/lisp/gnus/shr.el	Wed Oct 13 05:39:17 2010 +0000
+++ b/lisp/gnus/shr.el	Wed Oct 13 11:55:48 2010 +0000
@@ -68,14 +68,16 @@
   :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 @@
     (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))))