circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 645: 

Don't strip add newline if only copying part of wrapped line. Problem spotted
by and fix from Micah Cowan.
pull/1/head
Tiago Cunha 2010-02-18 12:36:18 +00:00
parent 66c38d8c5d
commit a9dacf10ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
window-copy.c
View File

@ -1,4 +1,4 @@
/* $Id: window-copy.c,v 1.102 2010-02-18 12:35:16 tcunha Exp $ */ /* $Id: window-copy.c,v 1.103 2010-02-18 12:36:18 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1038,7 +1038,7 @@ window_copy_copy_line(struct window_pane *wp,
} }
/* Only add a newline if the line wasn't wrapped. */ /* Only add a newline if the line wasn't wrapped. */
if (!wrapped) { if (!wrapped || ex != xx) {
*buf = xrealloc(*buf, 1, (*off) + 1); *buf = xrealloc(*buf, 1, (*off) + 1);
(*buf)[(*off)++] = '\n'; (*buf)[(*off)++] = '\n';
} }