[Emacs-diffs] /srv/bzr/emacs/trunk r106004: shr.el (shr-tag-img): Don't get images displayed in tables.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106004
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-10-06 09:25:26 +0000
message:
  shr.el (shr-tag-img): Don't get images displayed in tables.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-10-03 23:27:29 +0000
+++ b/lisp/gnus/ChangeLog       2011-10-06 09:25:26 +0000
@@ -1,3 +1,7 @@
+2011-10-06  Katsumi Yamaoka  <address@hidden>
+
+       * shr.el (shr-tag-img): Don't get images displayed in tables.
+
 2011-10-03  Glenn Morris  <address@hidden>
 
        * gnus-group.el (gnus-bug-group-download-format-alist): Once again get

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2011-10-02 22:03:55 +0000
+++ b/lisp/gnus/shr.el  2011-10-06 09:25:26 +0000
@@ -914,12 +914,13 @@
           (shr-encode-url url) 'shr-image-fetched
           (list (current-buffer) start (set-marker (make-marker) (1- (point))))
           t)))
-       (put-text-property start (point) 'keymap shr-map)
-       (put-text-property start (point) 'shr-alt alt)
-       (put-text-property start (point) 'image-url url)
-       (put-text-property start (point) 'image-displayer
-                          (shr-image-displayer shr-content-function))
-       (put-text-property start (point) 'help-echo alt)
+       (when (zerop shr-table-depth) ;; We are not in a table.
+         (put-text-property start (point) 'keymap shr-map)
+         (put-text-property start (point) 'shr-alt alt)
+         (put-text-property start (point) 'image-url url)
+         (put-text-property start (point) 'image-displayer
+                            (shr-image-displayer shr-content-function))
+         (put-text-property start (point) 'help-echo alt))
        (setq shr-state 'image)))))
 
 (defun shr-tag-pre (cont)