Ticket #2372: 2372_fix.diff

src/editor/edit-impl.h

@@ -74 +74 @@
 
 /* Configurable: log2 of the buffer size in bytes */
 #ifndef S_EDIT_BUF_SIZE
-#define S_EDIT_BUF_SIZE 16
+#define S_EDIT_BUF_SIZE 3
 #endif
 
 /* Size of the buffer */
@@ -88 +88 @@
  * This number can be increased for systems with enough physical memory.
  */
 #ifndef MAXBUFF
-#define MAXBUFF 1024
+#define MAXBUFF 91024
 #endif
 
 /* Maximal length of file that can be opened */

src/editor/edit.c

@@ -1758 +1758 @@
     gunichar ch;
     gchar *next_ch = NULL;
     int width = 0;
+    char buf[6 + 1];
 
     if (byte_index >= (edit->curs1 + edit->curs2) || byte_index < 0)
     {
@@ -1777 +1778 @@
 
     if (res < 0)
     {
-        ch = *str;
-        width = 0;
+        int i;
+
+        for (i = 0; i < 6; i++)
+            buf[i] = edit_get_byte (edit, byte_index + i);
+
+        buf[6] = '\0';
+
+        res = g_utf8_get_char_validated ((char *) buf, -1);
+        if (res < 0)
+        {
+            ch = *str;
+            width = 0;
+        }
+        else
+        {
+            ch = res;
+            next_ch = g_utf8_next_char ((char *) buf);
+            if (next_ch)
+            {
+                width = next_ch - (char *) buf;
+            }
+            else
+            {
+                ch = 0;
+                width = 0;
+            }
+        }
     }
     else
     {