[LyX/master] Fix a mistake
Koji Yokota
yokota at lyx.org
Sun Jun 14 12:37:13 UTC 2026
commit 7d402741424fa870a0999b5bb84aef4b774bd798
Author: Koji Yokota <yokota at lyx.org>
Date: Sun Jun 14 21:36:40 2026 +0900
Fix a mistake
---
src/frontends/qt/GuiInputMethod.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/frontends/qt/GuiInputMethod.cpp b/src/frontends/qt/GuiInputMethod.cpp
index 7d073483c4..e9a28b84ba 100644
--- a/src/frontends/qt/GuiInputMethod.cpp
+++ b/src/frontends/qt/GuiInputMethod.cpp
@@ -684,10 +684,7 @@ pos_type GuiInputMethod::pickNextSegFromTurnout(pos_type next_seg_pos, size_type
// 2. shared elements ( [C, min(B, D)) )
size_type seg_len = min(D - C, B - C);
// note: *cf has changed here
- if (cf != nullptr)
- cf->merge(past_cf);
- else
- *cf = past_cf;
+ cf->merge(past_cf);
seg = {C, seg_len, *cf};
LYXERR(Debug::KEY,
"Merged and registered: [" << C << ", " << C + seg_len
More information about the lyx-cvs
mailing list