aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #360 from LemonBoy/backport-patch

Browse Source 
Save a patch from the Flyspray oblivion, plus a nice unrelated commit to make everyone (un)happy
This commit is contained in:
dx 2015-11-23 13:08:13 -03:00
commit 0ca0c882a5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fe-text/gui-readline.c
View File

@ -147,7 +147,6 @@ static void window_next_page(void)
static void paste_buffer_join_lines(GArray *buf) static void paste_buffer_join_lines(GArray *buf)
{ {
#define IS_WHITE(c) ((c) == ' ' || (c) == '\t')
unsigned int i, count, indent, line_len; unsigned int i, count, indent, line_len;
unichar *arr, *dest, *last_lf_pos; unichar *arr, *dest, *last_lf_pos;
int last_lf; int last_lf;
@ -177,15 +176,15 @@ static void paste_buffer_join_lines(GArray *buf)
if (buf->len == 0) if (buf->len == 0)
return; return;
arr = (unichar *) paste_buffer->data; arr = (unichar *)buf->data;
/* first line */ /* first line */
if (IS_WHITE(arr[0])) if (isblank(arr[0]))
return; return;
/* find the first beginning of indented line */ /* find the first beginning of indented line */
for (i = 1; i < buf->len; i++) { for (i = 1; i < buf->len; i++) {
if (arr[i-1] == '\n' && IS_WHITE(arr[i])) if (arr[i-1] == '\n' && isblank(arr[i]))
break; break;
} }
if (i == buf->len) if (i == buf->len)
@ -193,7 +192,7 @@ static void paste_buffer_join_lines(GArray *buf)
/* get how much indentation we have.. */ /* get how much indentation we have.. */
for (indent = 0; i < buf->len; i++, indent++) { for (indent = 0; i < buf->len; i++, indent++) {
if (!IS_WHITE(arr[i])) if (!isblank(arr[i]))
break; break;
} }
if (i == buf->len) if (i == buf->len)
@ -203,7 +202,7 @@ static void paste_buffer_join_lines(GArray *buf)
count = indent; last_lf = TRUE; count = indent; last_lf = TRUE;
for (; i < buf->len; i++) { for (; i < buf->len; i++) {
if (last_lf) { if (last_lf) {
if (IS_WHITE(arr[i])) if (isblank(arr[i]))
count++; count++;
else { else {
last_lf = FALSE; last_lf = FALSE;
@ -220,11 +219,11 @@ static void paste_buffer_join_lines(GArray *buf)
get longer than 400 chars */ get longer than 400 chars */
dest = arr; last_lf = TRUE; last_lf_pos = NULL; line_len = 0; dest = arr; last_lf = TRUE; last_lf_pos = NULL; line_len = 0;
for (i = 0; i < buf->len; i++) { for (i = 0; i < buf->len; i++) {
if (last_lf && IS_WHITE(arr[i])) { if (last_lf && isblank(arr[i])) {
/* whitespace, ignore */ /* whitespace, ignore */
} else if (arr[i] == '\n') { } else if (arr[i] == '\n') {
if (!last_lf && i+1 != buf->len && if (!last_lf && i+1 != buf->len &&
IS_WHITE(arr[i+1])) { isblank(arr[i+1])) {
last_lf_pos = dest; last_lf_pos = dest;
*dest++ = ' '; *dest++ = ' ';
} else { } else {