diff -u src/fileio.c src/fileio.c
--- src/fileio.c	2003-01-18 14:43:30 +0900
+++ src/fileio.c	2007-06-16 23:41:55 +0900
@@ -1310,11 +1310,7 @@
 			len = 0;
 		}
 			/* write failed or last line has no EOL: stop here */
-#ifdef notdef
 		if (end == 0 || (lnum == buf->b_ml.ml_line_count && (buf->b_p_bin || !buf->b_p_eol)))
-#else
-		if (end == 0 || (buf->b_p_bin && lnum == buf->b_ml.ml_line_count && !buf->b_p_eol))
-#endif
 			break;
 #ifdef USE_OPT
 		if ((buf->b_p_opt & FOPT_MAC_FILE) || (buf->b_p_tx))
diff -u src/jptab.h src/jptab.h
--- src/jptab.h	2003-01-18 14:43:35 +0900
+++ src/jptab.h	2007-09-20 19:13:36 +0900
@@ -168,7 +168,7 @@
 	 '\203', '\205',
 	 '\203', '\207',
 	 '\203', '\142',
-	 '\201', '\174',
+	 '\201', '\133',
 	 '\203', '\101',
 	 '\203', '\103',
 	 '\203', '\105',
diff -u src/makjunix.mak src/makjunix.mak
--- src/makjunix.mak	2003-01-18 14:45:36 +0900
+++ src/makjunix.mak	2007-06-17 00:00:16 +0900
@@ -84,7 +84,7 @@
 MANLOC = $(PREFIX)/man/man1
 
 ### Location of help file
-HELPLOC = $(PREFIX)/lib
+HELPLOC = $(PREFIX)/share/vim
 
 ### Program to run on installed binary
 STRIP = strip
@@ -100,7 +100,7 @@
 
 MANFILE = ../doc/vim.1
 
-HELPFILE = ../doc/vim.hlp
+HELPFILE = ../doc.j/vim.hlp
 
 #
 # PART 2: various choices
@@ -462,14 +462,14 @@
 	ctags *.c *.h
 
 install: $(TARGET)
-	-mkdir $(BINLOC)
+	-mkdir -p $(BINLOC)
 	cp $(TARGET) $(BINLOC)
 	chmod $(BINMOD) $(BINLOC)/$(TARGET)
 	$(STRIP) $(BINLOC)/$(TARGET)
-	-mkdir $(MANLOC)
+	-mkdir -p $(MANLOC)
 	cp $(MANFILE) $(MANLOC)
 	chmod $(MANMOD) $(MANLOC)/vim.1
-	-mkdir $(HELPLOC)
+	-mkdir -p $(HELPLOC)
 	cp $(HELPFILE) $(HELPLOC)
 	chmod $(HELPMOD) $(HELPLOC)/vim.hlp
 
diff -u src/param.c src/param.c
--- src/param.c	2003-01-18 14:43:43 +0900
+++ src/param.c	2007-06-16 23:53:06 +0900
@@ -476,11 +476,7 @@
  * set the options in curwin and curbuf that are non-zero
  */
 	curwin->w_p_wrap = TRUE;
-#ifdef notdef
 	curbuf->b_p_ml = TRUE;
-#else
-	curbuf->b_p_ml = FALSE;
-#endif
 #if defined(KANJI) && defined(NT) && defined(SYNTAX)
 	curwin->w_p_syt = TRUE;
 #endif
diff -u src/unix.c src/unix.c
--- src/unix.c	2003-01-18 14:44:06 +0900
+++ src/unix.c	2008-05-26 20:31:42 +0900
@@ -117,7 +117,7 @@
 static void sig_winch __ARGS((int));
 #else
 # if defined(SIGWINCH) && !defined(linux) && !defined(__alpha) && !defined(mips) && !defined(_SEQUENT_) && !defined(SCO) && !defined(SOLARIS) && !defined(ISC) && !defined(__CYGWIN__)
-static void sig_winch __ARGS((int, int, struct sigcontext *));
+static void sig_winch __ARGS((int));
 # endif
 #endif
 
@@ -276,10 +276,8 @@
 sig_winch(sig)
 	int		sig;
 #  else
-sig_winch(sig, code, scp)
+sig_winch(sig)
 	int		sig;
-	int		code;
-	struct sigcontext *scp;
 #  endif
 # endif
 #endif
@@ -303,7 +301,11 @@
 #endif
 #ifdef SIGTSTP
 	settmode(0);
+	stoptermcap();
+	mch_restore_title(3);
 	kill(0, SIGTSTP);		/* send ourselves a STOP signal */
+	maketitle();
+	starttermcap();
 	settmode(1);
 #else
 	OUTSTR("new shell started\n");