Merge branch 'dev' into work/typesetter

# Conflicts:
#	src/gmdocument.c
#	src/ui/documentwidget.c
#	src/ui/inputwidget.h

1 files changed, 3 insertions, 1 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 0257eda0..cf128017 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -547,7 +547,9 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
     }
     clearUndo_InputWidget_(d);
     clear_Array(&d->text);
-    iConstForEach(String, i, text) {
+    iString *nfcText = collect_String(copy_String(text));
+    normalize_String(nfcText);
+    iConstForEach(String, i, nfcText) {
         pushBack_Array(&d->text, &i.value);
     }
     if (isFocused_Widget(d)) {