[Emacs-diffs] /srv/bzr/emacs/trunk r101948: shr: make shr-width a defcustom, use it in shr-tag-img.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101948
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2010-10-13 11:55:48 +0000
message:
  shr: make shr-width a defcustom, use it in shr-tag-img.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-13 05:39:17 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-13 11:55:48 +0000
@@ -1,3 +1,9 @@
+2010-10-13  Julien Danjou  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-dired.el (gnus-dired-attach): Silence XEmacs 21.5 when compiling.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-10-12 22:18:24 +0000
+++ b/lisp/gnus/shr.el  2010-10-13 11:55:48 +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))))