From 3e80f74d4512389c0162d7d150fe86dd8c1c87d9 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sat, 25 Sep 2010 23:05:16 +0200 Subject: [PATCH 1/1] gnus-html-rescale-image: Use our defalias gnus-window-inside-pixel-edges. Signed-off-by: Julien Danjou --- lisp/ChangeLog | 5 +++++ lisp/gnus-html.el | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26992b347..ea0dfa2f7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-25 Julien Danjou + + * gnus-html.el (gnus-html-rescale-image): Use our defalias + gnus-window-inside-pixel-edges. + 2010-09-25 Lars Magne Ingebrigtsen * 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 5199f7dfd..cb5d3c6e3 100644 --- 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 -- 2.25.1