Revert "gnus-html-rescale-image: Use window-inside-pixel-edges rather than window...

This is done for XEmacs support.

This reverts commit 1738374457ca432820ce4f76dd141402f00f80b0.

Conflicts:

	lisp/ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e45b785..79d72fe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -125,8 +125,6 @@
 
 2010-09-22  Julien Danjou  <julien@danjou.info>
 
-       * gnus-html.el (gnus-html-rescale-image): Use window-inside-pixel-edges
-       rather than window-pixel-edges.
        (gnus-html-put-image): Stop using markers. They are harmful if you have
        2 images side-by-side, they can't be properly update on text deletion.
        Using text-property is safer here.

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index 8acd6f8..a693a2b 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -432,7 +432,7 @@ Return a string with image data."
       image
     (let* ((width (car size))
           (height (cdr size))
-          (edges (window-inside-pixel-edges (get-buffer-window (current-buffer))))
+          (edges (window-pixel-edges (get-buffer-window (current-buffer))))
           (window-width (truncate (* gnus-max-image-proportion
                                      (- (nth 2 edges) (nth 0 edges)))))
           (window-height (truncate (* gnus-max-image-proportion