Set of changes to improve Unicode support with respect to combining characters.

Should address https://github.com/fish-shell/fish-shell/issues/155

1 files changed, 8 insertions, 3 deletions

diff --git a/reader.cpp b/reader.cpp
index 553c2e4b..af3cdf0d 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -721,9 +721,14 @@ static void remove_backward()
 
 	if( data->buff_pos <= 0 )
 		return;
-        
-    data->command_line.erase(data->buff_pos-1, 1);    
-	data->buff_pos--;
+    
+    /* Fake composed character sequences by continuning to delete until we delete a character of width at least 1. */
+    int width;
+    do {
+        data->buff_pos -= 1;
+        width = fish_wcwidth(data->command_line.at(data->buff_pos));
+        data->command_line.erase(data->buff_pos, 1);        
+    } while (width == 0 && data->buff_pos > 0);
     data->command_line_changed();
     data->suppress_autosuggestion = true;