From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 18 Aug 2021 13:14:29 +0000 (+0300)
Subject: Yet another place inside redisplay_window to prevent quitting
X-Git-Tag: emacs-28.0.90~1453
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee812f2a987d295659c041c577aac8db93de819f;p=emacs.git

Yet another place inside redisplay_window to prevent quitting

* src/xdisp.c (handle_single_display_spec): Inhibit quitting
around the call to lookup_image.  (Bug#44448)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index ceb0fa7e64d..ada9ed6c22b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5788,8 +5788,15 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
 #ifdef HAVE_WINDOW_SYSTEM
       else
 	{
+	  ptrdiff_t count = SPECPDL_INDEX ();
+
 	  it->what = IT_IMAGE;
+	  /* Don't allow quitting from lookup_image, for when we are
+	     displaying a non-selected window, and the buffer's point
+	     was temporarily moved to the window-point.  */
+	  specbind (Qinhibit_quit, Qt);
 	  it->image_id = lookup_image (it->f, value, it->face_id);
+	  unbind_to (count, Qnil);
 	  it->position = start_pos;
 	  it->object = NILP (object) ? it->w->contents : object;
 	  it->method = GET_FROM_IMAGE;