3 files changed, 27 insertions, 11 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 5f72076dc45..a14d36f3f80 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -214,8 +214,8 @@ LIBX_OTHER=@LIBX_OTHER@
 ## configure, which should set it to nil in non-X builds.
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
 
-## Only used for GNUstep
-LIBS_GNUSTEP=@LIBS_GNUSTEP@
+## Used only for GNUstep.
+LIBS_GNUSTEP=$(patsubst -specs=%-hardened-ld,,@LIBS_GNUSTEP@)
 
 LIBSOUND= @LIBSOUND@
 CFLAGS_SOUND= @CFLAGS_SOUND@
@@ -270,8 +270,8 @@ MSDOS_X_OBJ =
 NS_OBJ=@NS_OBJ@
 ## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o ns_fontfile if HAVE_NS.
 NS_OBJC_OBJ=@NS_OBJC_OBJ@
-## Only set if NS_IMPL_GNUSTEP.
-GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@
+## Used only for GNUstep.
+GNU_OBJC_CFLAGS=$(patsubst -specs=%-hardened-cc1,,@GNU_OBJC_CFLAGS@)
 ## w32fns.o w32menu.c w32reg.o fringe.o fontset.o w32font.o w32term.o
 ## w32xfns.o w32select.o image.o w32uniscribe.o if HAVE_W32, else
 ## empty.
diff --git a/src/insdel.c b/src/insdel.c
index f0a4dcd784e..05f37d6f647 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -126,7 +126,10 @@ gap_left (ptrdiff_t charpos, ptrdiff_t bytepos, bool newgap)
       if (i == 0)
         break;
       /* If a quit is requested, stop copying now.
-         Change BYTEPOS to be where we have actually moved the gap to.  */
+         Change BYTEPOS to be where we have actually moved the gap to.
+         Note that this cannot happen when we are called to make the
+         gap larger or smaller, since make_gap_larger and
+         make_gap_smaller prevent QUIT by setting inhibit-quit.  */
       if (QUITP)
         {
           bytepos = new_s1;
@@ -179,7 +182,10 @@ gap_right (ptrdiff_t charpos, ptrdiff_t bytepos)
       if (i == 0)
         break;
       /* If a quit is requested, stop copying now.
-         Change BYTEPOS to be where we have actually moved the gap to.  */
+         Change BYTEPOS to be where we have actually moved the gap to.
+         Note that this cannot happen when we are called to make the
+         gap larger or smaller, since make_gap_larger and
+         make_gap_smaller prevent QUIT by setting inhibit-quit.  */
       if (QUITP)
         {
           bytepos = new_s1;
@@ -386,7 +392,9 @@ make_gap_larger (ptrdiff_t nbytes_added)
 
   enlarge_buffer_text (current_buffer, nbytes_added);
 
-  /* Prevent quitting in move_gap.  */
+  /* Prevent quitting in gap_left.  We cannot allow a QUIT there,
+     because that would leave the buffer text in an inconsistent
+     state, with 2 gap holes instead of just one.  */
   tem = Vinhibit_quit;
   Vinhibit_quit = Qt;
 
@@ -432,7 +440,9 @@ make_gap_smaller (ptrdiff_t nbytes_removed)
   if (GAP_SIZE - nbytes_removed < GAP_BYTES_MIN)
     nbytes_removed = GAP_SIZE - GAP_BYTES_MIN;
 
-  /* Prevent quitting in move_gap.  */
+  /* Prevent quitting in gap_right.  We cannot allow a QUIT there,
+     because that would leave the buffer text in an inconsistent
+     state, with 2 gap holes instead of just one.  */
   tem = Vinhibit_quit;
   Vinhibit_quit = Qt;
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 8f1e98d99ef..840699d00fb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -825,6 +825,7 @@ static Lisp_Object redisplay_window_1 (Lisp_Object);
 static bool set_cursor_from_row (struct window *, struct glyph_row *,
                                  struct glyph_matrix *, ptrdiff_t, ptrdiff_t,
                                  int, int);
+static bool cursor_row_fully_visible_p (struct window *, bool, bool);
 static bool update_menu_bar (struct frame *, bool, bool);
 static bool try_window_reusing_current_matrix (struct window *);
 static int try_window_id (struct window *);
@@ -13881,11 +13882,16 @@ redisplay_internal (void)
               eassert (this_line_vpos == it.vpos);
               eassert (this_line_y == it.current_y);
               set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
+              if (cursor_row_fully_visible_p (w, false, true))
+                {
 #ifdef GLYPH_DEBUG
-              *w->desired_matrix->method = 0;
-              debug_method_add (w, "optimization 3");
+                  *w->desired_matrix->method = 0;
+                  debug_method_add (w, "optimization 3");
 #endif
-              goto update;
+                  goto update;
+                }
+              else
+                goto cancel;
             }
           else
             goto cancel;