(shr-tag-table): Really inhibit images inside the table.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0f9251..f375d91 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * shr.el (shr-find-elements): New function.
        (shr-tag-table): Put all the images after the table.
 
        * shr.el (shr-find-elements): New function.
        (shr-tag-table): Put all the images after the table.

+       (shr-tag-table): Really inhibit images inside the table.

 
        * mm-decode.el (mm-shr): Bind shr-blocked-images to
        gnus-blocked-images.
 
        * mm-decode.el (mm-shr): Bind shr-blocked-images to
        gnus-blocked-images.

diff --git a/lisp/shr.el b/lisp/shr.el
index d6eb19e..9d0aaef 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -414,11 +414,11 @@ Return a string with image data."
   (shr-ensure-paragraph)
   (setq cont (or (cdr (assq 'tbody cont))
                 cont))
   (shr-ensure-paragraph)
   (setq cont (or (cdr (assq 'tbody cont))
                 cont))

-  (let* ((columns (shr-column-specs cont))
+  (let* ((shr-inhibit-images t)
+        (columns (shr-column-specs cont))

         (suggested-widths (shr-pro-rate-columns columns))
         (sketch (shr-make-table cont suggested-widths))
         (suggested-widths (shr-pro-rate-columns columns))
         (sketch (shr-make-table cont suggested-widths))

-        (sketch-widths (shr-table-widths sketch (length suggested-widths)))
-        (shr-inhibit-images t))
+        (sketch-widths (shr-table-widths sketch (length suggested-widths))))

     (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths))
   (dolist (elem (shr-find-elements cont 'img))
     (shr-tag-img (cdr elem))))
     (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths))
   (dolist (elem (shr-find-elements cont 'img))
     (shr-tag-img (cdr elem))))