diff -r 4fc80c5c8c84 -r 002fe2ca0159 console/libgnt/gntutils.c --- a/console/libgnt/gntutils.c Sat Sep 02 23:06:25 2006 +0000 +++ b/console/libgnt/gntutils.c Sat Sep 02 23:23:30 2006 +0000 @@ -82,17 +82,18 @@ while (*start) { if ((end = strchr(start, '\n')) != NULL || (end = strchr(start, '\r')) != NULL) { - if (gnt_util_onscreen_width(start, end) <= maxw) { - ++end; - } else + if (gnt_util_onscreen_width(start, end) > maxw) end = NULL; } if (end == NULL) end = gnt_util_onscreen_width_to_pointer(start, maxw, NULL); str = g_string_append_len(str, start, end - start); + if (*end) { + str = g_string_append_c(str, '\n'); + if (*end == '\n' || *end == '\r') + end++; + } start = end; - if (*end && *end != '\n' && *end != '\r') - str = g_string_append_c(str, '\n'); } return g_string_free(str, FALSE); }