From owner-svn-src-user@FreeBSD.ORG  Wed Nov 13 14:35:01 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4390D7D8;
 Wed, 13 Nov 2013 14:35:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 336552609;
 Wed, 13 Nov 2013 14:35:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rADEZ1di062525;
 Wed, 13 Nov 2013 14:35:01 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rADEZ15C062524;
 Wed, 13 Nov 2013 14:35:01 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201311131435.rADEZ15C062524@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Wed, 13 Nov 2013 14:35:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258093 - user/ed/newcons/sys/dev/vt
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Nov 2013 14:35:01 -0000

Author: ray
Date: Wed Nov 13 14:35:00 2013
New Revision: 258093
URL: http://svnweb.freebsd.org/changeset/base/258093

Log:
  Do not add <CR><LF> for last (single) line of paste buffer.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/ed/newcons/sys/dev/vt/vt_buf.c

Modified: user/ed/newcons/sys/dev/vt/vt_buf.c
==============================================================================
--- user/ed/newcons/sys/dev/vt/vt_buf.c	Wed Nov 13 13:41:36 2013	(r258092)
+++ user/ed/newcons/sys/dev/vt/vt_buf.c	Wed Nov 13 14:35:00 2013	(r258093)
@@ -614,8 +614,11 @@ vtbuf_extract_marked(struct vt_buf *vb, 
 		for (c = cs; c < ce; c ++) {
 			buf[i++] = vb->vb_rows[r][c];
 		}
-		buf[i++] = '\r';
-		buf[i++] = '\n';
+		/* Add new line for all rows, but not for last one. */
+		if (r != e.tp_row) {
+			buf[i++] = '\r';
+			buf[i++] = '\n';
+		}
 	}
 }