gnus-html-rescale-image: Use our defalias gnus-window-inside-pixel-edges.

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 26992b3..ea0dfa2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-25  Julien Danjou  <julien@danjou.info>
+
+       * gnus-html.el (gnus-html-rescale-image): Use our defalias
+       gnus-window-inside-pixel-edges.
+
 2010-09-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * mm-decode.el (mm-save-part): Allow saving to other directories the

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index 5199f7d..cb5d3c6 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -104,7 +104,12 @@ CHARS is a regexp-like character alternative (e.g., \"[)$]\")."
                                          (match-string 0 encoded-text)))
                                 t t encoded-text)
                  s (1+ s)))
-         encoded-text)))))
+         encoded-text))))
+  ;; XEmacs does not have window-inside-pixel-edges
+  (defalias 'gnus-window-inside-pixel-edges
+    (if (fboundp 'window-inside-pixel-edges)
+        'window-inside-pixel-edges
+      'window-pixel-edges)))
 
 (defun gnus-html-encode-url (url)
   "Encode URL."
@@ -450,7 +455,7 @@ Return a string with image data."
       image
     (let* ((width (car size))
           (height (cdr size))
-          (edges (window-pixel-edges (get-buffer-window (current-buffer))))
+          (edges (gnus-window-inside-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