From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 3 May 2016 15:26:54 +0000 (+0200)
Subject: (shr-rescale-image): Clarify logic slightly
X-Git-Tag: emacs-26.0.90~2004
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43bb4305c5fc4caf15b075631874a4aac0611cc0;p=emacs.git

(shr-rescale-image): Clarify logic slightly

* lisp/net/shr.el (shr-rescale-image): Clarify logic slightly.
---

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index bf05fe93bae..1bc9105de94 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1008,8 +1008,8 @@ element is the data blob and the second element is the content-type."
 (defun shr-rescale-image (data content-type width height)
   "Rescale DATA, if too big, to fit the current buffer.
 WIDTH and HEIGHT are the sizes given in the HTML data, if any."
-  (if (not (and (fboundp 'imagemagick-types)
-                (get-buffer-window (current-buffer))))
+  (if (or (not (fboundp 'imagemagick-types))
+          (not (get-buffer-window (current-buffer))))
       (create-image data nil t :ascent 100)
     (let* ((edges (window-inside-pixel-edges
                    (get-buffer-window (current-buffer))))