about summary refs log tree commit diff
path: root/Src/Zle/zle_misc.c
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-09-11 21:47:53 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-09-11 21:49:16 +0000
commitd37b59fe0969a619f049dee081b15af696070009 (patch)
tree546df4597a8f4999db7ef243bdb9db0923847863 /Src/Zle/zle_misc.c
parente1c0a947cc845c71dd844db44016d07922cfcefa (diff)
downloadzsh-d37b59fe0969a619f049dee081b15af696070009.tar.gz
zsh-d37b59fe0969a619f049dee081b15af696070009.tar.xz
zsh-d37b59fe0969a619f049dee081b15af696070009.zip
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
Diffstat (limited to 'Src/Zle/zle_misc.c')
-rw-r--r--Src/Zle/zle_misc.c6
1 files changed, 0 insertions, 6 deletions
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;