Don't omit ZERO WIDTH NON-JOINER on clipboard paste

Fixes #11790

(cherry picked from commit 7b3404fcab0e2530964444261d411814c03eaeba)

diff --git a/src/Text.cpp b/src/Text.cpp
index 2d916c834b3c08265e0d3938866e2d0201eeda33..6e81268caeb6e11cf49def06aa6526a061cdfe43 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -866,8 +866,8 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
                                ++pos;
                                space_inserted = true;
                        }
-               } else if (!isPrintable(*cit)) {
-                       // Ignore unprintables
+               } else if (!isPrintable(*cit) && *cit != 0x200c) {
+                       // Ignore unprintables, except for ZWNJ (0x200c)
                        continue;
                } else {
                        // just insert the character

diff --git a/status.23x b/status.23x
index cf3a79311f58408905ffa5fe7881e510a01d9919..d33f2219d7feb1a812834845d4f2f33a6e693990 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -78,6 +78,8 @@ What's new
 
 - Fix over-hasty resetting of dialog in Child Documents settings (bug 11564).
 
+- Fix problems when pasting ZERO WIDTH NON-JOINER (bug 11790).
+
 
 * INTERNALS