diff options
| author | Lars Magne Ingebrigtsen | 2015-01-26 16:14:17 +1100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2015-01-26 16:14:17 +1100 |
| commit | dafb0ef852f88f535df5527def7516a13bf63c60 (patch) | |
| tree | b930dc4d84965fa8f844634c57916ac1d1b0edd8 | |
| parent | 8fded982c147ec5e062df4c11a8769e9443859f3 (diff) | |
| download | emacs-dafb0ef852f88f535df5527def7516a13bf63c60.tar.gz emacs-dafb0ef852f88f535df5527def7516a13bf63c60.zip | |
* lisp/net/shr.el (shr-make-table-1): Fix colspan typo.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/shr.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 044c2999396..8af0ec46cad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2015-01-26 Lars Ingebrigtsen <larsi@gnus.org> | 1 | 2015-01-26 Lars Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * net/shr.el (shr-make-table-1): Fix colspan typo. | ||
| 4 | |||
| 3 | * net/eww.el (eww-add-bookmark): Fix prompt and clean up the code | 5 | * net/eww.el (eww-add-bookmark): Fix prompt and clean up the code |
| 4 | slightly. | 6 | slightly. |
| 5 | 7 | ||
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'." | |||
| 1660 | (aref widths width-column) | 1660 | (aref widths width-column) |
| 1661 | 10)) | 1661 | 10)) |
| 1662 | (when (and fill | 1662 | (when (and fill |
| 1663 | (setq colspan (dom-attr column colspan))) | 1663 | (setq colspan (dom-attr column 'colspan))) |
| 1664 | (setq colspan (min (string-to-number colspan) | 1664 | (setq colspan (min (string-to-number colspan) |
| 1665 | ;; The colspan may be wrong, so | 1665 | ;; The colspan may be wrong, so |
| 1666 | ;; truncate it to the length of the | 1666 | ;; truncate it to the length of the |