From 5f08a1b41d89071aef99d67d24ad2aa0c72dfcb8 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 14 Jun 2017 15:08:27 +0200
Subject: [PATCH] When entering an inset by cursor, reset boundary

This happens when cursor-left/right enters an inset.

Fixes bug #10630.

(cherry picked from commit 2e84b8030e69f209d6565d11b4ae84f01d450d0d)
---
 src/Text2.cpp | 2 ++
 status.22x    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Text2.cpp b/src/Text2.cpp
index c3d696e7e2..a8ee59ee9b 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -615,6 +615,7 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front)
 		--cur.pos();
 	inset->edit(cur, front);
 	cur.setCurrentFont();
+	cur.boundary(false);
 	return true;
 }
 
@@ -634,6 +635,7 @@ bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool mo
 	inset->edit(cur, movingForward, 
 		movingLeft ? Inset::ENTRY_DIRECTION_RIGHT : Inset::ENTRY_DIRECTION_LEFT);
 	cur.setCurrentFont();
+	cur.boundary(false);
 	return true;
 }
 
diff --git a/status.22x b/status.22x
index 6b90ee133c..abda25426b 100644
--- a/status.22x
+++ b/status.22x
@@ -76,6 +76,8 @@ What's new
 
 - Fix potential crash when cursor enters an inset (bug 10691).
 
+- Avoid a case of stuck cursor after entering an inset (bug 10630).
+
 
 * INTERNALS
 
-- 
2.39.5