Commit d0e0de31 authored by Julien Danjou's avatar Julien Danjou Committed by Katsumi Yamaoka
Browse files

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

parent 68d9bf4b
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.
......
......@@ -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))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment