diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2018-05-08 07:17:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-08 07:17:10 +0200 |
| commit | daf6ce86cb668d24f278dca91846fc7b8619757d (patch) | |
| tree | 0b4566b41b46d7a3c3b25786fb8554127a749753 | |
| parent | 0a0c755b89c932f058899011d73bedf3a516a8d5 (diff) | |
| parent | 631650bd8ab467af8347b5d9b51b2b0193adfe63 (diff) | |
| download | irssi-daf6ce86cb668d24f278dca91846fc7b8619757d.zip | |
Merge pull request #878 from irssi/revert-873-empty_lines
Revert "record line info on empty lines"
| -rw-r--r-- | src/fe-common/core/formats.c | 9 | ||||
| -rw-r--r-- | src/fe-text/textbuffer.c | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 8ad4b3af..4c819c2d 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -1233,15 +1233,6 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) dup = str = g_strdup(text); flags = 0; fgcolor = theme->default_color; bgcolor = -1; - - if (*str == '\0') { - /* empty line, write line info only */ - signal_emit_id(signal_gui_print_text, 6, dest->window, - GINT_TO_POINTER(fgcolor), - GINT_TO_POINTER(bgcolor), - GINT_TO_POINTER(flags), str, - dest); - } while (*str != '\0') { type = '\0'; for (ptr = str; *ptr != '\0'; ptr++) { diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c index 9e1ace96..01cdd118 100644 --- a/src/fe-text/textbuffer.c +++ b/src/fe-text/textbuffer.c @@ -355,6 +355,9 @@ LINE_REC *textbuffer_insert(TEXT_BUFFER_REC *buffer, LINE_REC *insert_after, g_return_val_if_fail(buffer != NULL, NULL); g_return_val_if_fail(data != NULL, NULL); + if (len == 0) + return insert_after; + line = !buffer->last_eol ? insert_after : textbuffer_line_insert(buffer, insert_after); |