[gnus git] branch master updated: m0-7-113-g85de68c =3= (shr-tag-base): Protect against base specs that are degenerate. ; * shr.el (shr-insert-table): Respect border-collapse: collapse. ; Fix syntax error

       via  85de68c435317f0e5ec851498a4ff163c3d1c596 (commit)
       via  13dc9d1f11063a2ae674d47bd26e8b1a0afc93f7 (commit)
       via  e2f76dd6460112f6ec7e106ebaff244e8e2d1e37 (commit)
      from  fdad453a347206c51b7fcef198e96712d3b269ed (commit)


- Log -----------------------------------------------------------------
commit 85de68c435317f0e5ec851498a4ff163c3d1c596
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Mon Jun 17 23:02:26 2013 +0200

    (shr-tag-base): Protect against base specs that are degenerate.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4e2db3..50d2180 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
 2013-06-17  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* shr.el (shr-insert-table): Respect border-collapse: collapse.
+	(shr-tag-base): Protect against base specs that are degenerate.
 
 	* eww.el (eww-convert-widgets): Put `help-echo' on input fields so that
 	we can navigate to them.
diff --git a/lisp/shr.el b/lisp/shr.el
index 92e6250..16c2936 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -1016,7 +1016,9 @@ ones, in case fg and bg are nil."
       plist)))
 
 (defun shr-tag-base (cont)
-  (setq shr-base (shr-parse-base (cdr (assq :href cont))))
+  (let ((base (cdr (assq :href cont))))
+    (when base
+      (setq shr-base (shr-parse-base base))))
   (shr-generic cont))
 
 (defun shr-tag-a (cont)

commit 13dc9d1f11063a2ae674d47bd26e8b1a0afc93f7
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Mon Jun 17 22:29:01 2013 +0200

    * shr.el (shr-insert-table): Respect border-collapse: collapse.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3ebfe9..a4e2db3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-06-17  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* shr.el (shr-insert-table): Respect border-collapse: collapse.
+
 	* eww.el (eww-convert-widgets): Put `help-echo' on input fields so that
 	we can navigate to them.
 
diff --git a/lisp/shr.el b/lisp/shr.el
index 25fa4f3..92e6250 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -350,7 +350,7 @@ size, and full-buffer size."
 	(shr-stylesheet shr-stylesheet)
 	(start (point)))
     (when style
-      (if (string-match "color\\|display" style)
+      (if (string-match "color\\|display\\|border-collapse" style)
 	  (setq shr-stylesheet (nconc (shr-parse-style style)
 				      shr-stylesheet))
 	(setq style nil)))
@@ -1317,7 +1317,11 @@ ones, in case fg and bg are nil."
     (nreverse result)))
 
 (defun shr-insert-table (table widths)
-  (shr-insert-table-ruler widths)
+  (let* ((collapse (equal (cdr (assq 'border-collapse shr-stylesheet))
+			  "collapse"))
+	 (shr-table-vertical-line (if collapse "" shr-table-vertical-line)))
+    (unless collapse
+      (shr-insert-table-ruler widths))
   (dolist (row table)
     (let ((start (point))
 	  (height (let ((max 0))
@@ -1345,7 +1349,8 @@ ones, in case fg and bg are nil."
 		(shr-add-font start (1- (point))
 			      (list :background (nth 4 column)))))
 	    (forward-line 1)))))
-    (shr-insert-table-ruler widths)))
+      (unless collapse
+	(shr-insert-table-ruler widths)))))
 
 (defun shr-insert-table-ruler (widths)
   (when (and (bolp)

commit e2f76dd6460112f6ec7e106ebaff244e8e2d1e37
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Mon Jun 17 22:02:15 2013 +0200

    Fix syntax error

diff --git a/lisp/shr.el b/lisp/shr.el
index b5dddae..25fa4f3 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -1163,7 +1163,7 @@ ones, in case fg and bg are nil."
   (shr-generic cont))
 
 (defun shr-tag-span (cont)
-  (shr-generic cont)))
+  (shr-generic cont))
 
 (defun shr-tag-h1 (cont)
   (shr-heading cont 'bold 'underline))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    3 ++
 lisp/shr.el    |   71 ++++++++++++++++++++++++++++++-------------------------
 2 files changed, 42 insertions(+), 32 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project