[Emacs-diffs] master 43bb430: (shr-rescale-image): Clarify logic slightly

[Lars Ingebrigtsen]

branch: master
commit 43bb4305c5fc4caf15b075631874a4aac0611cc0
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    (shr-rescale-image): Clarify logic slightly
    
    * lisp/net/shr.el (shr-rescale-image): Clarify logic slightly.
---
 lisp/net/shr.el |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index bf05fe9..1bc9105 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))))