diff --git a/Changes b/Changes
index 50b39f4..0936e0e 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 Release ...
 * vi no longer dies with a segmentation fault if a line does not fit on the
   screen after an insertion.
+* The 'p' command now works correctly if the buffer contains a partial line
+  with multibyte characters.
 
 Release 2/25/05
 * Traditional regular expressions can now be used with multibyte characters.
diff --git a/ex_version.c b/ex_version.c
index 5f1e6af..384bb18 100644
--- a/ex_version.c
+++ b/ex_version.c
@@ -70,12 +70,12 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Sccsid @(#)ex_version.c	1.130 (gritter) 3/4/05
+ * Sccsid @(#)ex_version.c	1.131 (gritter) 3/24/05
  */
 
 #include "ex.h"
 
-static char *versionstring = "@(#)Version 4.0 (gritter) 3/4/05";
+static char *versionstring = "@(#)Version 4.0 (gritter) 3/24/05";
 
 void 
 printver(void)
diff --git a/ex_vis.h b/ex_vis.h
index 19ebc15..d6fd99c 100644
--- a/ex_vis.h
+++ b/ex_vis.h
@@ -72,7 +72,7 @@
  *
  *	from ex_vis.h	7.4 (Berkeley) 5/31/85
  *
- *	@(#)ex_vis.h	1.17 (gritter) 1/10/05
+ *	@(#)ex_vis.h	1.18 (gritter) 3/24/05
  */
 
 /*
@@ -288,7 +288,7 @@ var	cell	lastcmd[5];	/* Chars in last command */
 var	int	lastcnt;	/* Count for last command */
 var	cell	*lastcp;	/* Save current command here to repeat */
 var	bool	lasthad;	/* Last command had a count? */
-var	short	lastvgk;	/* Previous input key, if not from keyboard */
+var	int	lastvgk;	/* Previous input key, if not from keyboard */
 var	short	lastreg;	/* Register with last command */
 var	char	*ncols['z'-'a'+2];	/* Cursor positions of marks */
 var	char	*notenam;	/* Name to be noted with change count */