>From 5fff3ba4c26ec7105a54f0189a53145d4a287541 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 2 Sep 2015 12:16:39 +0000 Subject: [PATCH 1/3] Revert "35834: strip a final newline from pasted text: inserting is hard to tell apart from accepting it" This reverts commit f17eb26a34af69a2238a3d8b46079445e09c096e. Conflicts: ChangeLog Src/Zle/zle_misc.c --- ChangeLog | 1 + Src/Zle/zle_misc.c | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index cdaed18..bfb71f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -371,6 +371,7 @@ * 36125: Src/Zle/zle_hist.c: don't set history context in get-line + [reverted in NNNNN] * 35834 (tweaked): Src/Zle/zle_misc.c: strip a final newline from pasted text: inserting is hard to tell apart from accepting it diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c index 2d18628..c1005dc 100644 --- a/Src/Zle/zle_misc.c +++ b/Src/Zle/zle_misc.c @@ -787,12 +787,6 @@ bracketedpaste(char **args) zmult = 1; if (region_active) killregion(zlenoargs); - /* Chop a final newline if its insertion would be hard to - * distinguish by the user from the line being accepted. */ - else if (n > 1 && zlecontext != ZLCON_VARED && - (zlecs + (insmode ? 0 : n - 1)) >= zlell && - wpaste[n-1] == ZWC('\n')) - n--; yankcs = yankb = zlecs; doinsert(wpaste, n); yanke = zlecs; -- 2.1.4