From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 18 May 2021 23:15:04 +0000 (-0400)
Subject: * lisp/net/shr.el (shr-image-displayer): Use proper closures
X-Git-Tag: emacs-28.0.90~2407
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=26041ec8d518806e29566af4428bb61d6d36d0b7;p=emacs.git

* lisp/net/shr.el (shr-image-displayer): Use proper closures
---

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index cbdeb65ba8b..873f0457e3a 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1257,20 +1257,20 @@ Return a string with image data."
 CONTENT-FUNCTION is a function to retrieve an image for a cid url that
 is an argument.  The function to be returned takes three arguments URL,
 START, and END.  Note that START and END should be markers."
-  `(lambda (url start end)
-     (when url
-       (if (string-match "\\`cid:" url)
-	   ,(when content-function
-	      `(let ((image (funcall ,content-function
-				     (substring url (match-end 0)))))
-		 (when image
-		   (goto-char start)
-		   (funcall shr-put-image-function
-			    image (buffer-substring start end))
-		   (delete-region (point) end))))
-         (url-retrieve url #'shr-image-fetched
-		       (list (current-buffer) start end)
-		       t t)))))
+  (lambda (url start end)
+    (when url
+      (if (string-match "\\`cid:" url)
+	  (when content-function
+	    (let ((image (funcall content-function
+				  (substring url (match-end 0)))))
+	      (when image
+		(goto-char start)
+		(funcall shr-put-image-function
+			 image (buffer-substring start end))
+		(delete-region (point) end))))
+        (url-retrieve url #'shr-image-fetched
+		      (list (current-buffer) start end)
+		      t t)))))
 
 (defun shr-heading (dom &rest types)
   (shr-ensure-paragraph)