Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
	T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1460581494; bh=iZKzEyY5XVPfieCu3uljSf1JbkVMmNf+MmZtNGbbCq8=; h=From:To:Subject:Date:From:Subject; b=pqRUrlpcJo5tHUvjoTKc60FawbNm2ZupkvBvKCLJNCkfZI3Q+AU//kIoRf+vWHoRw41BOs1Q9QaTfN/Om717ELl8vFzHkwCSrcb6T+5jeginONi2Vbpq2MwM9IX38DYmPLnX5ICvrstW78Ttr9s/Z7l6kT0Q+KLXFzhpHZ8lKDD8L0wR+ZxkJ5YQ1wKa0zp6O9GX32OtA56PIx08OicxVu6fCZAd8DkPQhpauHCQPHiAPUgXEC64cbk5K2YpL0wSJ3815L9xJJl70J11+dh3i1S0aQd+NNMXXsU/r8O/0SmnstZwa7c73+6PugKxoH1YN6m4xXRgH7ZC+w67LGZAiA==
X-Yahoo-Newman-Id: 897554.80904.bm@smtp124.mail.ir2.yahoo.com
X-Yahoo-Newman-Property: ymail-3
X-YMail-OSG: xErsdS8VM1kRD1I.DSe6kQY86arDx_3FqJ39ZyOD8WYz6dL
 F4vLogJrjWjpthhehjB0tIhZM4KFbL1FKXs9XIXyl4gE.V.8LK2ptjG5N.hr
 5Qi0biDbiw__GMkEUjM1qBNEaQLr6T27Cx_Tlie5Tde5tT5N6QihWQ8FVx58
 ok7zeO4REEDNxD4y2UQ4Q.hzF_Kz1HhqulIjHYFbrBwpUNl0uaOnTIEABHTY
 kSEgMatepQ0AfuJ6T57IS.Xf15u3U.bxZXskWlFXEww7_k8HkMqRG_lHJuap
 bnL7BrhA942R46ix.C6D9OSUyFwZm8Kl1Qd4e3OkZ02G7E6ppd57BOYfyy71
 gbnkqeS9A7NwJrBVqn1WD4rrpCij2aaoI4f3N2mHfju6tLunHny8x55m3TOk
 uQI4K1xLcqLsh1ORyjNlBAMh3Pt2Wp.6XHqovkna7mRfVrF_dSVZX.xDsqxZ
 YnJqlRVZ6WsZ1eBriUXgGifIJTPIljzd6oiqMw3HM78SbyRayoQkI1hZc2U1
 zIaOzuMmd1zv.5zLYhB8sk38T0SaVfgE-
X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI-
From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: Zsh workers <zsh-workers@zsh.org>
Subject: PATCH: fix vi visual range including blank final line
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <2416.1460581493.1@thecus.kiddle.eu>
Date: Wed, 13 Apr 2016 23:04:53 +0200
Message-ID: <2417.1460581493@thecus.kiddle.eu>
X-Seq: zsh-workers 38287

With a visual selection that has the cursor on the last line of the
buffer and where that line is empty, a yank would include the final null
character. This fixes it.

Oliver

diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c
index 86840bd..953af24 100644
--- a/Src/Zle/zle_vi.c
+++ b/Src/Zle/zle_vi.c
@@ -255,7 +255,7 @@ getvirange(int wf)
     }
 
     /* visual selection mode needs to include additional position */
-    if (visual == 1 && invicmdmode())
+    if (visual == 1 && pos < zlell && invicmdmode())
 	INCPOS(pos);
 
     /* Was it a line-oriented move?  If so, the command will have set *

