From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 26 Jan 2015 05:14:17 +0000 (+1100)
Subject: * lisp/net/shr.el (shr-make-table-1): Fix colspan typo.
X-Git-Tag: emacs-25.0.90~2577^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dafb0ef852f88f535df5527def7516a13bf63c60;p=emacs.git

* lisp/net/shr.el (shr-make-table-1): Fix colspan typo.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 044c2999396..8af0ec46cad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2015-01-26  Lars Ingebrigtsen  <larsi@gnus.org>
 
+	* net/shr.el (shr-make-table-1): Fix colspan typo.
+
 	* net/eww.el (eww-add-bookmark): Fix prompt and clean up the code
 	slightly.
 
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index feb934c7190..a0c9eba4144 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1660,7 +1660,7 @@ The preference is a float determined from `shr-prefer-media-type'."
 			(aref widths width-column)
 		      10))
 	      (when (and fill
-			 (setq colspan (dom-attr column colspan)))
+			 (setq colspan (dom-attr column 'colspan)))
 		(setq colspan (min (string-to-number colspan)
 				   ;; The colspan may be wrong, so
 				   ;; truncate it to the length of the