update to vim 4.4beta

1 files changed, 7 insertions, 3 deletions

diff --git a/usr.bin/vim/ops.c b/usr.bin/vim/ops.c
index 332aa96157a..c95fb1571ad 100644
--- a/usr.bin/vim/ops.c
+++ b/usr.bin/vim/ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ops.c,v 1.1 1996/09/07 21:40:25 downsj Exp $	*/
+/*	$OpenBSD: ops.c,v 1.2 1996/09/21 06:23:13 downsj Exp $	*/
 /* vi:set ts=4 sw=4:
  *
  * VIM - Vi IMproved		by Bram Moolenaar
@@ -1323,7 +1323,8 @@ do_put(dir, count, fix_indent)
 
 	if (y_size == 0 || y_array == NULL)
 	{
-		EMSG2("Nothing in register %s", transchar(yankbuffer));
+		EMSG2("Nothing in register %s",
+					yankbuffer == 0 ? (char_u *)"\"" : transchar(yankbuffer));
 		return;
 	}
 
@@ -1666,6 +1667,8 @@ do_dis(arg)
 				for (p = yb->y_array[j]; *p && (n -= charsize(*p)) >= 0; ++p)
 					msg_outtrans_len(p, 1);
 			}
+			if (n > 1 && yb->y_type == MLINE)
+				MSG_OUTSTR("^J");
 			flushbuf();				/* show one line at a time */
 		}
 	}
@@ -2374,7 +2377,8 @@ read_viminfo_register(line, fp, force)
 	}
 	if (!isalnum(*str) && *str != '-')
 	{
-		EMSG2("viminfo: Illegal register name in line %s", line);
+		if (viminfo_error("Illegal register name", line))
+			return TRUE;		/* too many errors, pretend end-of-file */
 		do_it = FALSE;
 	}
 	yankbuffer = *str++;