From d37b59fe0969a619f049dee081b15af696070009 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Fri, 11 Sep 2015 21:47:53 +0000 Subject: 36443: 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 | 5 +++++ Src/Zle/zle_misc.c | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 914ee4e47..a484ad7fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-09-11 Daniel Shahaf + + * 36443: Revert 35834. + 2015-09-11 Peter Stephenson * 36496 (plus tweak for key buffer length): Src/Zle/zle_hist.c, @@ -438,6 +442,7 @@ * 35834 (tweaked): Src/Zle/zle_misc.c: strip a final newline from pasted text: inserting is hard to tell apart from accepting it + [reverted in 36443] 2015-08-12 Mikael Magnusson diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c index 12143e05f..297dc4ca8 100644 --- a/Src/Zle/zle_misc.c +++ b/Src/Zle/zle_misc.c @@ -785,12 +785,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; -- cgit 1.4.1