Mercurial > emacs
changeset 110966:0272ba632fc2
shr: make shr-width a defcustom, use it in shr-tag-img.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 13 Oct 2010 11:55:48 +0000 |
| parents | 8c6b3fc2a999 |
| children | 188673195616 |
| files | lisp/gnus/ChangeLog lisp/gnus/shr.el |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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))))