(shr-insert-document): Bind shr-width dynamically to window-width if it's nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6288501..e67db2a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-insert-document): Bind shr-width dynamically to
+       window-width if it's nil.
+
 2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
 
        * shr.el (shr-width, shr-insert-document): Allow nil as shr-width value

diff --git a/lisp/shr.el b/lisp/shr.el
index c403c6d..0ed73cd 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -1,6 +1,6 @@
 ;;; shr.el --- Simple HTML Renderer
 
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: html
@@ -115,11 +115,10 @@ cid: URL as the argument.")
 
 ;;;###autoload
 (defun shr-insert-document (dom)
-  (unless (integerp shr-width)
-    (set (make-local-variable 'shr-width) (window-width)))
   (setq shr-content-cache nil)
   (let ((shr-state nil)
-       (shr-start nil))
+       (shr-start nil)
+       (shr-width (or shr-width (window-width))))
     (shr-descend (shr-transform-dom dom))))
 
 (defun shr-copy-url ()