diff -uNr vim.orig/src/Makefile vim/src/Makefile
--- vim.orig/src/Makefile	1969-12-31 18:00:00.000000000 -0600
+++ vim/src/Makefile	2005-11-22 21:31:16.000000000 -0600
@@ -0,0 +1,635 @@
+# vi:ts=8:sw=8
+# Makefile for Vim on Unix
+#
+
+# Note: You MUST uncomment three hardware dependend lines!
+
+# There are three types of defines:
+#
+# 1. configuration dependend
+#	Used for "make install". Adjust the path names and protections
+#	to your desire. Also defines the root for the X11 files (not required).
+#
+# 2. various choices
+#	Can be changed to match your compiler or your preferences (not
+#	required).
+#
+# 3. hardware dependend
+#	If you machine is in the list, remove one '#' in front of the defines
+#	following it. Otherwise: Find a machine that is similar and change the
+#	defines to make it work. Normally you can just try and see what error
+#	messages you get. (REQUIRED).
+
+# The following systems have entries below. They have been tested and should
+# work without modification. But later code changes may cause small problems.
+# There are entries for other systems, but these have not been tested recently.
+
+#system:		tested configurations:		tested by:
+
+#Sun 4.1.x		cc	gcc	X11	no X11	(jw) (mool)
+#FreeBSD		cc	gcc	X11	no X11	(mool)
+#linux 1.0		cc		X11
+#Linux 1.0.9			gcc		no X11	(jw)
+#ULTRIX 4.2A on MIPS	cc	gcc		no X11	(mool)
+#HPUX			cc	gcc	X11	no X11	(jw) (mool)
+#irix 4.0.5H		cc		X11
+#IRIX 4.0  SGI		cc		X11		(jw)
+#SINIX-L 5.41		cc			no X11
+#MOT188			cc			no X11
+#Sequent/ptx 1.3	cc			no X11	(jw)
+#osf1			cc			no X11	(jw)
+#Unisys 6035		cc			no X11
+#SCO 3.2		cc	gcc		no X11	jos@oce.nl
+#Solaris		cc		X11
+#Solaris/Sun OS 5.3	cc			no X11	(jw)
+#AIX (rs6000)		cc			no X11	(jw)
+#RISCos on MIPS		cc		X11	no X11	(jw)
+
+# configurations marked by (jw) have been tested by Juergen Weigert:
+#    jnweiger@uni-erlangen.de
+
+#
+# PART 1: configuration dependend
+#
+
+### root directory for X11 files (unless overruled in hardware-dependend part)
+### Unfortunately there is no standard for these, everybody puts them
+### somewhere else
+#X11LIBDIR = /usr/openwin/lib
+#X11INCDIR = /usr/openwin/include
+### for some hpux systems:
+#X11LIBDIR = /usr/lib/X11R5
+#X11INCDIR = /usr/include/X11R5
+###
+X11LIBDIR = /usr/X11R6/lib
+X11INCDIR = /usr/X11R6/include
+###
+#X11LIBDIR = /usr/X386/lib
+#X11INCDIR = /usr/X386/include
+###
+#X11LIBDIR = /usr/X11/lib
+#X11INCDIR = /usr/X11/include
+
+
+### Prefix for location of files
+PREFIX = $(DESTDIR)/usr
+
+### Location of binary
+BINLOC = $(PREFIX)/bin
+
+### Name of target
+TARGET = jvim
+
+### Location of man page
+MANLOC = $(PREFIX)/share/man/man1
+
+### Location of help file
+HELPLOC = $(PREFIX)/lib/jvim
+
+### Program to run on installed binary
+STRIP = strip
+
+### Permissions for vim binary
+BINMOD = 755
+
+### Permissions for man page
+MANMOD = 644
+
+### Permissions for help file
+HELPMOD = 644
+
+MANFILE = ../doc/vim.1
+
+HELPFILE = ../doc.j/vim.hlp
+
+#
+# PART 2: various choices
+#
+
+### -DDIGRAPHS		digraph support
+### -DNO_FREE_NULL	do not call free() with a null pointer
+### -DCOMPATIBLE	start in vi-compatible mode
+### -DNOBACKUP		default is no backup file
+### -DDEBUG		output a lot of debugging garbage
+### -DSTRNCASECMP	use strncasecmp() instead of internal function
+### -DUSE_LOCALE	use setlocale() to change ctype() and others
+### -DTERMCAP		full termcap/terminfo file support
+### -DTERMINFO		use terminfo instead of termcap entries for builtin terms
+### -DNO_BUILTIN_TCAPS	do not include builtin termcap entries
+###				(use only with -DTERMCAP)
+### -DSOME_BUILTIN_TCAPS include most useful builtin termcap entries
+###				(use only without -DNO_BUILTIN_TCAPS)
+### -DALL_BUILTIN_TCAPS	include all builtin termcap entries
+###				(use only without -DNO_BUILTIN_TCAPS)
+### -DMAXNAMLEN 31	maximum length of a file name (if not defined in sys/dir.h)
+### -Dconst=		for compilers that don't have type const
+### -DVIMRC_FILE=name		name of the .vimrc file in current dir
+### -DEXRC_FILE=name		name of the .exrc file in current dir
+### -DSYSVIMRC_FILE=name	name of the global .vimrc file
+### -DSYSEXRC_FILE=name		name of the global .exrc file
+### -DDEFVIMRC_FILE=name	name of the system-wide .vimrc file
+### -DVIM_HLP=name		name of the help file
+### -DUSE_SYSTEM	use system() instead of fork/exec for starting a shell
+### -DVIM_ISSPACE	use when isspace() can't handle meta chars
+### -DNOLIMITS		limits.h does not exist
+### -DNOSTDLIB		stdlib.h does not exist
+### -DUSE_X11		include code for xterm title saving
+### -DWEBB_COMPLETE	include Webb's code for command line completion
+### -DWEBB_KEYWORD_COMPL include Webb's code for keyword completion
+### -DNOTITLE		'title' option off by default
+
+#
+# PART 2-2: Select Japanese Input System dependend
+#
+
+# generic for FEP Sequence
+#
+#FEPOPT  = -DFEPCTRL
+#FEPLIBS =
+#FEPOBJS = fepseq.o
+
+# generic for BOW IME control Sequence
+#
+#FEPOPT  = -DFEPCTRL -DJP_DEF=\"SSS\"
+#FEPLIBS =
+#FEPOBJS = fepbow.o
+
+# generic for CANNA input system
+#
+FEPOPT  = -DFEPCTRL -DCANNA
+FEPLIBS = -lcanna
+FEPOBJS = fepcanna.o
+
+# generic for ONEW input system
+#
+#FEPOPT  = -DFEPCTRL -DONEW
+#FEPLIBS = -lonew -lcanna
+#FEPOBJS = feponew.o
+
+DEFS = -DDIGRAPHS -DTERMCAP -DSOME_BUILTIN_TCAPS -DNO_FREE_NULL -DVIM_ISSPACE \
+		-DWEBB_COMPLETE -DWEBB_KEYWORD_COMPL \
+		-DVIM_HLP=\"$(HELPLOC)/jvim.hlp\" \
+		-DKANJI -DUCODE -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_TAGEX -DUSE_OPT $(FEPOPT) \
+		-DUSE_LOCALE
+
+#
+# PART 3: hardware dependend
+#
+
+### CC entry:      name and arguments for the compiler (also for linking)
+### MACHINE entry: defines used for compiling (not for linking)
+### LIBS:          defines used for linking
+
+# generic for Sun, NeXT, POSIX and SYSV R4 (?) (TESTED for Sun 4.1.x)
+# standard cc with optimizer
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE -DUSE_X11
+#CC=cc -O -I$(X11INCDIR)
+#LIBS = -ltermlib -L$(X11LIBDIR) -lX11
+
+# generic for Sun, FreeBSD, NetBSD, NeXT, POSIX and SYSV R4 (?) without x11 code
+#	(TESTED for Sun 4.1.x and FreeBSD)
+# standard cc with optimizer
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE
+#CC=cc -O
+#LIBS = -ltermlib
+
+# FreeBSD and NetBSD with Xfree (TESTED for FreeBSD)
+# standard cc with optimizer
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE -DUSE_X11
+#CC=cc -O -I$(X11INCDIR)
+#LIBS = -ltermlib -L$(X11LIBDIR) -lX11
+
+# FreeBSD and NetBSD with Xfree (TESTED for FreeBSD)
+# gcc with optimizer
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE -DUSE_X11
+#CC=gcc -O -Wall -traditional -Dconst= -I$(X11INCDIR)
+#LIBS = -ltermlib -L$(X11LIBDIR) -lX11
+
+# like generic, but with termcap, for Linux, NeXT and others (NOT TESTED YET)
+# standard cc with optimizer
+#
+#MACHINE = -DBSD_UNIX
+#CC=cc -O
+#LIBS = -ltermcap
+
+# Linux 2.0.x/2.2.x (TESTED Debian GNU/Linux 2.0/2.1)
+#MACHINE = -DBSD_UNIX
+#CC=gcc -O
+#LIBS = -lncurses
+
+# Debian GNU/Linux 2.x
+MACHINE = -DBSD_UNIX -DUSE_X11 -DDebian
+CC=gcc -O
+LIBS = -lncurses -L$(X11LIBDIR) -lX11
+
+# Cygwin (TESTED 1.1-NetRelease)
+#   Notes: Please check ../doc.j/cygwin.txt
+#
+#TARGET=vim.exe
+#MACHINE = -DBSD_UNIX
+#CC=gcc -O
+#LIBS = -ltermcap
+
+# linux 1.0 with X11 (TESTED)
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE -DUSE_X11
+#CC=cc -O -I$(X11INCDIR)
+#LIBS = -ltermcap -L$(X11LIBDIR) -lX11
+
+# like generic, but with debugging (NOT TESTED YET)
+#
+#MACHINE = -DBSD_UNIX -g
+#CC=cc
+#LIBS = -ltermlib
+
+# like generic, but with gcc and X11 (TESTED on Sun 4.1.x)
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE -DUSE_X11
+#CC=gcc -O -Wall -traditional -Dconst= -L$(X11LIBDIR) -I$(X11INCDIR)
+#LIBS = -ltermlib -lX11
+
+# like generic, but with gcc, without X11 (TESTED on ULTRIX 4.2A on MIPS)
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE
+#CC=gcc -O -Wall -traditional -Dconst=
+#LIBS = -ltermlib
+
+# like generic, but with gcc 2.5.8 (TESTED on Sun 4.1.3_U1)
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE
+#CC=gcc -O1000
+#LIBS = -ltermlib
+
+# standard cc with optimizer for ULTRIX 4.2A on MIPS (ultrix defined) (TESTED)
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE
+#CC=cc -O -Olimit 1500
+#LIBS = -ltermlib
+
+# GCC (2.2.2d) on Linux (1.0.9) (TESTED)
+#
+#MACHINE = -DBSD_UNIX
+#CC=gcc -O6 -Wall
+#LIBS = -ltermcap
+
+# Apollo DOMAIN (with SYSTYPE = bsd4.3) (NOT TESTED YET)
+#
+#MACHINE = -DBSD_UNIX -DDOMAIN
+#CC=cc -O -A systype,bsd4.3
+#LIBS = -ltermlib
+
+# HPUX with X11 (TESTED) (hpux is defined)
+#
+#MACHINE = -DBSD_UNIX -DTERMINFO -DUSE_X11
+#CC=cc -O -I$(X11INCDIR)
+#LIBS = -ltermcap -L$(X11LIBDIR) -lX11
+
+# HPUX (TESTED) (hpux is defined)
+#
+#MACHINE = -DBSD_UNIX -DTERMINFO
+#CC=cc -O
+#LIBS = -ltermcap
+
+# HPUX with gcc (TESTED) (hpux is defined)
+#
+#MACHINE = -DBSD_UNIX -DTERMINFO
+#CC=gcc -O
+#LIBS = -ltermcap
+
+# hpux 9.01 (with termlib instead of termcap) (TESTED)
+# irix 4.0.5H (TESTED)
+#
+#MACHINE = -DBSD_UNIX -DUSE_LOCALE -DUSE_X11
+#CC=cc -O -I$(X11INCDIR)
+#LIBS = -ltermlib -L$(X11LIBDIR) -lX11
+
+# IRIX 4.0 (Silicon Graphics Indigo, __sgi will be defined) (TESTED)
+#
+#MACHINE = -DBSD_UNIX -DUSE_X11                         
+#CC=cc -O -Olimit 1500
+#LIBS = -ltermlib -lX11 -lmalloc -lc_s
+
+# Convex (NOT TESTED YET)
+#
+#MACHINE = -DBSD_UNIX -DCONVEX
+#CC=cc -O
+#LIBS = -ltermcap
+
+# generic SYSV_UNIX for Dynix/PTX and SYSV R3 (and R4?) (TESTED on SINIX-L 5.41)
+# (TESTED on MOT188) (TESTED on Sequent/ptx 1.3) (TESTED on osf1)
+# First try the line with locale. If this gives error messages try the other one.
+#
+#MACHINE = -DSYSV_UNIX -DUSE_LOCALE
+#MACHINE = -DSYSV_UNIX
+#CC=cc -O
+#LIBS = -ltermlib
+
+# generic SYSV_UNIX with LOCALE (TESTED on Unisys 6035)
+#
+#MACHINE = -DSYSV_UNIX -DUSE_LOCALE -DUNISYS
+#CC=cc -O
+#LIBS = -ltermlib
+
+# SCO Xenix (NOT TESTED YET)
+#
+#MACHINE = -DSYSV_UNIX -DSCO
+#CC=cc -O
+#LIBS = -ltermlib
+
+# GCC on SCO 3.2 (TESTED by jos@oce.nl)
+# cc works too.
+#
+#MACHINE = -DSYSV_UNIX -UM_XENIX -DSCO
+#CC=gcc -O -Wall
+#LIBS = -ltinfo
+
+# GCC on another SCO Unix (NOT TESTED YET)
+#
+#MACHINE = -DSYSV_UNIX -UM_XENIX -DSCO -g
+#CC=gcc -O6 -fpcc-struct-return -fwritable-strings
+#LIBS = -ltermlib -lmalloc
+
+# Dynix with gcc (NOT TESTED YET)
+#
+#MACHINE = -DSYSV_UNIX
+#CC=gcc -O -Wall -traditional
+#LIBS = -ltermlib
+
+# SOLARIS with X11 anc cc (TESTED)
+#
+#MACHINE = -DSYSV_UNIX -DSOLARIS -DTERMINFO -DUSE_X11
+#CC=cc -O -Xa -v -R$(X11LIBDIR) -L$(X11LIBDIR) -I$(X11INCDIR)
+#LIBS = -ltermlib -lX11
+
+# SOLARIS with X11 and gcc (TESTED with SOLARIS 2.3 and gcc 2.5.8)
+#
+#MACHINE = -DSYSV_UNIX -DSOLARIS -DTERMINFO -DUSE_X11
+#CC=gcc -O -R$(X11LIBDIR) -L$(X11LIBDIR) -I$(X11INCDIR)
+#LIBS = -ltermlib -lX11
+
+# SOLARIS (also works for Esix 4.0.3, SYSV R4?) (TESTED on Sun OS 5.3)
+#
+#MACHINE = -DSYSV_UNIX -DSOLARIS -DTERMINFO
+#CC=cc -O -Xa -v
+#LIBS = -ltermlib
+
+# UNICOS (NOT TESTED YET)
+#
+#MACHINE = -DSYSV_UNIX -DUNICOS
+#CC=cc -O
+#LIBS = -ltermlib
+
+# AIX (rs6000) (TESTED)
+#
+#MACHINE = -DSYSV_UNIX -DAIX
+#CC=cc -O
+#LIBS=-lcur
+
+# UTS2 for Amdahl UTS 2.1.x (disable termcap below) (NOT TESTED YET)
+#
+#MACHINE = -DSYSV_UNIX -DUTS2
+#CC=cc -O
+#LIBS = -ltermlib -lsocket
+
+# UTS4 for Amdahl UTS 4.x (NOT TESTED YET)
+#
+#MACHINE = -DSYSV_UNIX -DUTS4 -Xa
+#CC=cc -O
+#LIBS = -ltermlib
+
+# USL for Unix Systems Laboratories (SYSV 4.2) (NOT TESTED YET)
+#
+#MACHINE = -DSYSV_UNIX -DUSL
+#CC=cc -O
+#LIBS = -ltermlib
+
+# RISCos on MIPS without X11 (TESTED)
+#
+#MACHINE = -DSYSV_UNIX -DMIPS
+#CC=cc -O
+#LIBS = -ltermlib
+
+# RISCos on MIPS with X11 (TESTED)
+#
+#MACHINE=-DSYSV_UNIX -DUSE_LOCALE -DUSE_X11
+#CC=cc -O -I$(X11INCDIR)
+#LIBS=-ltermlib -L$(X11LIBDIR) -lX11 -lsun
+
+# NEC EWS4800 Series (EWS-UX/V R6.x)
+#
+#MACHINE = -DSYSV_UNIX -DSOLARIS -DTERMINFO
+#CC=cc -O -KOlimit=3000
+#LIBS = -ltermlib -lsocket -lnsl
+
+
+################################################
+##   no changes required below this line      ##
+################################################
+
+CFLAGS = -c $(MACHINE) $(DEFS)
+
+INCL = vim.h globals.h param.h keymap.h macros.h ascii.h term.h unix.h structs.h proto.h
+
+OBJ =	alloc.o unix.o buffer.o charset.o cmdcmds.o cmdline.o \
+	csearch.o digraph.o edit.o fileio.o getchar.o help.o \
+	linefunc.o main.o mark.o memfile.o memline.o message.o misccmds.o \
+	normal.o ops.o param.o quickfix.o regexp.o \
+	regsub.o screen.o search.o \
+	tag.o term.o undo.o window.o $(TERMLIB) kanji.o track.o \
+	u2s.o s2u.o $(FEPOBJS)
+
+GOBJ = grep.o alloc.o charset.o kanji.o regexp.o regsub.o u2s.o s2u.o
+
+all: $(TARGET) grep
+
+$(TARGET): $(OBJ) version.c
+	$(CC) $(CFLAGS) version.c
+	$(CC) -o $(TARGET) $(OBJ) version.o $(LIBS) $(FEPLIBS)
+
+grep: $(GOBJ)
+	$(CC) -o grep/grep $(GOBJ) $(LIBS) $(FEPLIBS)
+
+debug: $(OBJ) version.c
+	$(CC) $(CFLAGS) version.c
+	$(CC) -o $(TARGET) -g $(OBJ) version.o $(LIBS)
+
+ctags:
+	ctags *.c *.h
+
+install: $(TARGET)
+	-mkdir $(BINLOC)
+	cp $(TARGET) $(BINLOC)
+	chmod $(BINMOD) $(BINLOC)/$(TARGET)
+	$(STRIP) $(BINLOC)/$(TARGET)
+	-mkdir $(MANLOC)
+	cp $(MANFILE) $(MANLOC)/jvim.1
+	chmod $(MANMOD) $(MANLOC)/jvim.1
+	-mkdir $(HELPLOC)
+	cp $(HELPFILE) $(HELPLOC)/jvim.hlp
+	chmod $(HELPMOD) $(HELPLOC)/jvim.hlp
+
+clean:
+	-rm -f $(OBJ) mkcmdtab.o version.o core $(TARGET) mkcmdtab cmdtab.h
+	-rm -f *.bak
+	-rm -f $(GOBJ)
+	-rm -f grep/grep
+#	-rm -f jptab.h jptab
+
+#use this in case the files have been transported via an MSDOS system
+
+FILES = *.c *.h makefile makefile.* cmdtab.tab proto/*.pro tags
+
+dos2unix:
+	-mv arp_prot.h arp_proto.h
+	-mv ptx_stdl.h ptx_stdlib.h
+	-mv sun_stdl.h sun_stdlib.h
+	-mv makefile.dic makefile.dice
+	-mv makefile.uni makefile.unix
+	-mv makefile.man makefile.manx
+	-mv makefile.6sa makefile.6sas
+	-mv makefile.5sa makefile.5sas
+	for i in $(FILES); do tr -d '\r\032' < $$i > ~tmp~; mv ~tmp~ $$i; echo $$i; done
+
+###########################################################################
+
+alloc.o:	alloc.c  $(INCL)
+	$(CC) $(CFLAGS) alloc.c
+
+unix.o:	unix.c  $(INCL)
+	$(CC) $(CFLAGS) unix.c
+
+buffer.o:	buffer.c  $(INCL)
+	$(CC) $(CFLAGS) buffer.c
+
+charset.o:	charset.c  $(INCL)
+	$(CC) $(CFLAGS) charset.c
+
+cmdcmds.o:	cmdcmds.c  $(INCL)
+	$(CC) $(CFLAGS) cmdcmds.c
+
+cmdline.o:	cmdline.c  $(INCL) cmdtab.h ops.h
+	$(CC) $(CFLAGS) cmdline.c
+
+csearch.o:	csearch.c  $(INCL)
+	$(CC) $(CFLAGS) csearch.c
+
+digraph.o:	digraph.c  $(INCL)
+	$(CC) $(CFLAGS) digraph.c
+
+edit.o:	edit.c  $(INCL) ops.h
+	$(CC) $(CFLAGS) edit.c
+
+fileio.o:	fileio.c  $(INCL)
+	$(CC) $(CFLAGS) fileio.c
+
+getchar.o:	getchar.c  $(INCL)
+	$(CC) $(CFLAGS) getchar.c
+
+help.o:	help.c  $(INCL)
+	$(CC) $(CFLAGS) help.c
+
+linefunc.o:	linefunc.c  $(INCL)
+	$(CC) $(CFLAGS) linefunc.c
+
+main.o:	main.c  $(INCL)
+	$(CC) $(CFLAGS) main.c
+
+mark.o:	mark.c  $(INCL)
+	$(CC) $(CFLAGS) mark.c
+
+memfile.o:	memfile.c  $(INCL)
+	$(CC) $(CFLAGS) memfile.c
+
+memline.o:	memline.c  $(INCL)
+	$(CC) $(CFLAGS) memline.c
+
+message.o:	message.c  $(INCL)
+	$(CC) $(CFLAGS) message.c
+
+misccmds.o:	misccmds.c  $(INCL)
+	$(CC) $(CFLAGS) misccmds.c
+
+normal.o:	normal.c  $(INCL) ops.h
+	$(CC) $(CFLAGS) normal.c
+
+ops.o:	ops.c  $(INCL) ops.h
+	$(CC) $(CFLAGS) ops.c
+
+param.o:	param.c  $(INCL)
+	$(CC) $(CFLAGS) param.c
+
+quickfix.o:	quickfix.c  $(INCL)
+	$(CC) $(CFLAGS) quickfix.c
+
+regexp.o:	regexp.c  $(INCL)
+	$(CC) $(CFLAGS) regexp.c
+
+regsub.o:	regsub.c  $(INCL)
+	$(CC) $(CFLAGS) regsub.c
+
+screen.o:	screen.c  $(INCL)
+	$(CC) $(CFLAGS) screen.c
+
+search.o:	search.c  $(INCL) ops.h
+	$(CC) $(CFLAGS) search.c
+
+tag.o:	tag.c  $(INCL)
+	$(CC) $(CFLAGS) tag.c
+
+term.o:	term.c  $(INCL)
+	$(CC) $(CFLAGS) term.c
+
+undo.o:	undo.c  $(INCL)
+	$(CC) $(CFLAGS) undo.c
+
+window.o:	window.c  $(INCL)
+	$(CC) $(CFLAGS) window.c
+
+cmdtab.h: cmdtab.tab mkcmdtab
+	./mkcmdtab cmdtab.tab cmdtab.h
+
+mkcmdtab: mkcmdtab.o
+	$(CC) -o mkcmdtab mkcmdtab.o
+
+mkcmdtab.o: mkcmdtab.c
+	$(CC) $(CFLAGS) mkcmdtab.c
+
+kanji.o: kanji.c $(INCL) jptab.h
+	$(CC) $(CFLAGS) kanji.c
+
+s2u.o: s2u.c
+	$(CC) $(CFLAGS) s2u.c
+
+u2s.o: u2s.c
+	$(CC) $(CFLAGS) u2s.c
+
+track.o: track.c $(INCL) jptab.h
+	$(CC) $(CFLAGS) track.c
+
+#jptab.h: jptab
+#	./jptab > jptab.h
+
+jptab: jptab.o
+	$(CC) -o jptab jptab.o
+
+jptab.o: jptab.c
+	$(CC) $(CFLAGS) jptab.c
+
+fepseq.o: fepseq.c
+	$(CC) $(CFLAGS) fepseq.c
+
+fepbow.o: fepbow.c
+	$(CC) $(CFLAGS) fepbow.c
+
+fepcanna.o: fepcanna.c
+	$(CC) $(CFLAGS) -I/usr/include/canna fepcanna.c
+
+feponew.o: feponew.c
+	$(CC) $(CFLAGS) feponew.c
+
+grep.o: grep/grep.c
+	$(CC) $(CFLAGS) -I. grep/grep.c
diff -uNr vim.orig/src/term.c vim/src/term.c
--- vim.orig/src/term.c	2005-11-22 20:59:26.000000000 -0600
+++ vim/src/term.c	2005-11-22 21:33:27.000000000 -0600
@@ -26,7 +26,7 @@
 # ifdef linux
 #  include <termcap.h>
 #  if 0		/* only required for old versions, it's now in termcap.h */
-    typedef int (*outfuntype) (int);
+	typedef int (*outfuntype) (int);
 #  endif
 #  define TPUTSFUNCAST
 # else
@@ -106,14 +106,14 @@
 
 	p++;
 	for (;;)
-    {
+	{
 		while (*s++)
 			;
 		p += *s++;
 		if (!*s)
 			return;
 		*p++ = s;
-    }
+	}
 }
 
 #ifdef TERMCAP
@@ -241,12 +241,12 @@
 			/* term_strings.t_sku = TGETSTR("", &tp); termcap code unknown */
 			/* term_strings.t_skd = TGETSTR("", &tp); termcap code unknown */
 #ifdef ARCHIE
-            /* Termcap code made up! */
-            term_strings.t_sku = tgetstr("su", &tp);
-            term_strings.t_skd = tgetstr("sd", &tp);
+		/* Termcap code made up! */
+		term_strings.t_sku = tgetstr("su", &tp);
+		term_strings.t_skd = tgetstr("sd", &tp);
 #else
-            term_strings.t_sku = NULL;
-            term_strings.t_skd = NULL;
+		term_strings.t_sku = NULL;
+		term_strings.t_skd = NULL;
 #endif
 #if defined(UNIX) && !defined(notdef)
 			if (term_strings.t_sku == NULL)
@@ -356,7 +356,7 @@
 	ttest(TRUE);
 		/* display initial screen after ttest() checking. jw. */
 	if (width <= 0 || height <= 0)
-    {
+	{
 		/* termcap failed to report size */
 		/* set defaults, in case mch_get_winsize also fails */
 		width = 80;
@@ -406,7 +406,7 @@
 		--p;
 		*p = i % 10 + '0';
 		i /= 10;
-    }
+	}
 	while (i > 0 && p > buf);
 	return p;
 }
@@ -430,14 +430,14 @@
 		return "OOPS";
 	e = buf + 29;
 	for (s = buf; s < e && *cm; cm++)
-    {
+	{
 		if (*cm != '%')
-        {
+	{
 			*s++ = *cm;
 			continue;
 		}
 		switch (*++cm)
-        {
+	{
 		case 'd':
 			p = (char *)tltoa((unsigned long)y);
 			y = x;
@@ -452,13 +452,13 @@
 			*s++ = (char)(*++cm + y);
 			y = x;
 			break;
-        case '%':
+	case '%':
 			*s++ = *cm;
 			break;
 		default:
 			return "OOPS";
 		}
-    }
+	}
 	*s = '\0';
 	return buf;
 }
@@ -585,7 +585,7 @@
 	if (bpos > BSIZE - 20)		/* avoid terminal strings being split up */
 		flushbuf();
 	if (s)
-#if defined(TERMCAP) && !(defined(linux) && defined(NCURSES_BUG))
+#if defined(TERMCAP) && !(defined(linux) && defined(NCURSES_BUG)) || (defined(linux) && defined(Debian))
 		tputs(s, 1, TPUTSFUNCAST outchar);
 #else
 		while (*s)
@@ -635,10 +635,10 @@
 		t = "cm";
 
 	if (t)
-    {
-    	sprintf(buf, s, t);
-    	EMSG(buf);
-    }
+	{
+	sprintf(buf, s, t);
+	EMSG(buf);
+	}
 
 /*
  * if "cs" defined, use a scroll region, it's faster.
@@ -900,7 +900,7 @@
 {
 	OUTSTRN(tltoa((unsigned long)n));
 }
- 
+
 	void
 check_winsize()
 {
diff -uNr vim.orig/src/unix.c vim/src/unix.c
--- vim.orig/src/unix.c	2005-11-22 20:59:26.000000000 -0600
+++ vim/src/unix.c	2005-11-22 21:34:52.000000000 -0600
@@ -343,10 +343,10 @@
 	char	**argv;
 {
 	if (!isatty(0) || !isatty(1))
-    {
+	{
 		fprintf(stderr, "VIM: no controlling terminal\n");
 		exit(2);
-    }
+	}
 }
 
 /*
@@ -653,7 +653,7 @@
 	char_u *buf;
 	int len;
 {
-#if defined(SYSV_UNIX) || defined(USL) || defined(hpux) || defined(linux)
+#if defined(SYSV_UNIX) || defined(USL) || defined(hpux) || ( defined(linux) && !defined(Debian) )
 	extern int		errno;
 # ifndef linux
 	extern char		*sys_errlist[];
@@ -661,10 +661,10 @@
 
 	if (getcwd((char *)buf, len) == NULL)
 	{
-	    STRCPY(buf, sys_errlist[errno]);
-	    return FAIL;
+		STRCPY(buf, sys_errlist[errno]);
+		return FAIL;
 	}
-    return OK;
+	return OK;
 #else
 	return (getwd((char *)buf) != NULL ? OK : FAIL);
 #endif
@@ -922,22 +922,22 @@
 	{
 		struct ttysize	ts;
 
-	    if (ioctl(0, TIOCGSIZE, &ts) == 0)
-	    {
+		if (ioctl(0, TIOCGSIZE, &ts) == 0)
+		{
 			Columns = ts.ts_cols;
 			Rows = ts.ts_lines;
-	    }
+		}
 	}
 # else /* TIOCGSIZE */
 #  ifdef TIOCGWINSZ
 	{
 		struct winsize	ws;
 
-	    if (ioctl(0, TIOCGWINSZ, &ws) == 0)
-	    {
+		if (ioctl(0, TIOCGWINSZ, &ws) == 0)
+		{
 			Columns = ws.ws_col;
 			Rows = ws.ws_row;
-	    }
+		}
 	}
 #  endif /* TIOCGWINSZ */
 # endif /* TIOCGSIZE */
@@ -947,9 +947,9 @@
  */
 	if (Columns == 0 || Rows == 0)
 	{
-	    if ((p = (char_u *)getenv("LINES")))
+		if ((p = (char_u *)getenv("LINES")))
 			Rows = atoi((char *)p);
-	    if ((p = (char_u *)getenv("COLUMNS")))
+		if ((p = (char_u *)getenv("COLUMNS")))
 			Columns = atoi((char *)p);
 	}
 
@@ -1289,10 +1289,10 @@
 	fd_set fdset;
 
 	if (ticks >= 0)
-    {
-   		tv.tv_sec = ticks / 1000;
+	{
+		tv.tv_sec = ticks / 1000;
 		tv.tv_usec = (ticks % 1000) * (1000000/1000);
-    }
+	}
 
 	FD_ZERO(&fdset);
 	FD_SET(0, &fdset);
@@ -1388,7 +1388,7 @@
 	if (*mktemp((char *)tmpname) == NUL)
 	{
 		emsg(e_notmp);
-	    return FAIL;
+		return FAIL;
 	}
 
 /*
@@ -1454,7 +1454,7 @@
 /*
  * read the names from the file into memory
  */
- 	fd = fopen((char *)tmpname, "r");
+	fd = fopen((char *)tmpname, "r");
 	if (fd == NULL)
 	{
 		emsg2(e_notopen, tmpname);
diff -uNr vim.orig/src/unix.h vim/src/unix.h
--- vim.orig/src/unix.h	2005-11-22 20:59:26.000000000 -0600
+++ vim/src/unix.h	2005-11-22 21:36:18.000000000 -0600
@@ -27,11 +27,11 @@
 #endif
 
 #ifndef DEFVIMRC_FILE
-# define DEFVIMRC_FILE	"/usr/local/etc/vimrc"
+# define DEFVIMRC_FILE	"/etc/jvimrc"
 #endif
 
 #ifndef VIM_HLP
-# define VIM_HLP		"/usr/local/lib/vim.hlp"
+# define VIM_HLP		"/usr/lib/jvim/jvim.hlp"
 #endif
 
 #ifndef BACKUPDIR
diff -uNr vim.orig/tools/vim132 vim/tools/vim132
--- vim.orig/tools/vim132	1993-10-13 00:32:46.000000000 -0500
+++ vim/tools/vim132	2005-11-22 21:30:23.000000000 -0600
@@ -1,11 +1,25 @@
-#! /bin/csh
-# Shell script for use with UNIX
-# Starts up Vim with the terminal in 132 column mode
-# Only works on VT-100 terminals and lookalikes
+#! /bin/sh
 #
-set oldterm=$term
+# - the original script is csh script, but lintian recommend
+#   not to use csh script. so I convert this into sh script
+#
+oldterm=$TERM
 echo "[?3h"
-setenv TERM vt100-w 
-vim $*
-set term=$oldterm
+export TERM=vt100-w 
+jvim $*
+TERM=$oldterm
 echo "[?3l"
+
+# following comment is the original csh script
+# #! /bin/csh
+# # Shell script for use with UNIX
+# # Starts up Vim with the terminal in 132 column mode
+# # Only works on VT-100 terminals and lookalikes
+# #
+# set oldterm=$term
+# echo "[?3h"
+# setenv TERM vt100-w 
+# vim $*
+# set term=$oldterm
+# echo "[?3l"
+#