[Emacs-diffs] trunk r113044: Don't colourise images from tables

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 113044
revision-id: address@hidden
parent: address@hidden
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-18 10:46:53 +0000
message:
  Don't colourise images from tables
  
  * shr.el (shr-tag-table): Insert the images after the table, so that
  they're not covered by the table coulorisation, which often looked
  awkward.
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/shr.el               shr.el-20101002102929-yfzewk55rsg0mn93-1

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-06-18 09:29:20 +0000
+++ b/lisp/gnus/ChangeLog       2013-06-18 10:46:53 +0000
@@ -1,3 +1,9 @@
+2013-06-18  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * shr.el (shr-tag-table): Insert the images after the table, so that
+       they're not covered by the table colourisation, which often looked
+       awkward.
+
 2013-06-18  Katsumi Yamaoka  <address@hidden>
 
        * eww.el (eww-detect-charset): Improve regexp; move backward.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2013-06-18 07:10:56 +0000
+++ b/lisp/gnus/shr.el  2013-06-18 10:46:53 +0000
@@ -1248,13 +1248,7 @@
             (frame-width))
       (setq truncate-lines t))
     ;; Then render the table again with these new "hard" widths.
-    (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths))
-  ;; Finally, insert all the images after the table.  The Emacs buffer
-  ;; model isn't strong enough to allow us to put the images actually
-  ;; into the tables.
-  (when (zerop shr-table-depth)
-    (dolist (elem (shr-find-elements cont 'img))
-      (shr-tag-img (cdr elem)))))
+    (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths)))
 
 (defun shr-tag-table (cont)
   (shr-ensure-paragraph)
@@ -1318,7 +1312,13 @@
              body))))))
     (when bgcolor
       (shr-colorize-region start (point) (cdr (assq 'color shr-stylesheet))
-                          bgcolor))))
+                          bgcolor))
+    ;; Finally, insert all the images after the table.  The Emacs buffer
+    ;; model isn't strong enough to allow us to put the images actually
+    ;; into the tables.
+    (when (zerop shr-table-depth)
+      (dolist (elem (shr-find-elements cont 'img))
+       (shr-tag-img (cdr elem))))))
 
 (defun shr-find-elements (cont type)
   (let (result)