diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 1ff6e2a24cf6b032c71b3b52fa1d84cbfea0e916..269eb439e9a971bf17c23628310dac0da21f6c62 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 20
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 22
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,6 +30,12 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Problem with hang in setmouse() -> update_mouseshape() (Froloff)
+    - check for termcap_active in option.c
+    - add gui.starting in misc2.c
+
+":e" causes a scroll (in spell.c).
+
 Mac unicode patch (Da Woon Jung):
 - selecting proportional font breaks display
 - UTF-8 text causes display problems.  Font replacement causes this.
@@ -50,13 +56,17 @@ Awaiting response:
 -   Win32: tearoff menu window should have a scrollbar when it's taller than
     the screen.
 
+When on a line with a single character, "A CTRL-O <Home>" puts cursor back
+after end-of-line. (Peter Winters)  Make "o_eol" global and reset it when
+moving cursor?
+
 
 PLANNED FOR VERSION 7.0:
 
 -   Add SPELLCHECKER, with support for many languages.
     - Use "engspchk" from Charles Campbell for ideas.
-    - Only look in @Spell groups or when there isn't such a group.
-    - Don't use vim_iswordc_buf(), always use the same wordchar.
+    - Alternative: use aspell library.
+    - Implement 's addition.
     - Commands required:
 	add word to private dict: wrong and OK (in popup menu for evim)
 	    :spell good <word>	    zg
@@ -69,8 +79,8 @@ PLANNED FOR VERSION 7.0:
     - Need wordlists for many languages; "language pack"
     - Use wordlists from openoffice (myspell).  Work together with them to
       update the wordlist.  (Adri Verhoef, Aad Nales)
-    - Support for approximate-regexps will help (agrep
-      http://www.tgries.de/agrep/).
+    - Support for approximate-regexps will help with finding similar words
+      (agrep http://www.tgries.de/agrep/).
     - Charles Campbell asks for method to add "contained" groups to
       existing syntax items (to add @Spell).
       Add ":syntax contains {pattern} add=@Spell" command?  A bit like ":syn
@@ -106,6 +116,7 @@ PLANNED FOR VERSION 7.0:
       Vim-script list.
     - For interpreted languages, use the interpreter to obtain information.
       Should work for Java (Eclipse does this), Python, Tcl, etc.
+      Richard Emberson mentioned working on an interface to Java.
     - Check Readline for its completion interface.
     - Use ctags for other languages.  Writing a file could trigger running
       ctags, merging the tags of the changed file.
diff --git a/runtime/doc/xxd-it.UTF-8.1 b/runtime/doc/xxd-it.UTF-8.1
index 0bdc792e8715a63bfbac5131156413dc48cdf02e..f919a183162c198640c106bfcfbf3daa1bd115d9 100644
--- a/runtime/doc/xxd-it.UTF-8.1
+++ b/runtime/doc/xxd-it.UTF-8.1
@@ -21,9 +21,9 @@
 crea un'immagine esadecimale di un dato file o dello "standard input".
 Può anche ottenere da un'immagine esadecimale il file binario originale.
 Come
-.BR uuencode(1)
+.BR uuencode (1)
 e
-.BR uudecode(1)
+.BR uudecode (1)
 permette di trasmettere dati binari in una rapresentazione ASCII "a prova
 di email", ma ha anche il vantaggio di poter decodificare sullo "standard
 output".  Inoltre, può essere usato per effettuare delle modifiche (patch)
@@ -124,21 +124,21 @@ o delle linee vuote possono essere inserite a piacere [e vengono ingorate].
 .TP
 .I \-seek distanza
 Usato con l'opzione
-.I \-r
-: (ricostruzione),
+.IR \-r :
+(ricostruzione),
 .RI < distanza >
 viene aggiunta alla posizione nel file trovata nella immagine
 esadecimale.
 .TP
-.I \-s [\+][\-]seek
+.I \-s [+][\-]seek
 Inizia a
 .RI < seek >
 bytes assoluti (o relativi) di distanza all'interno di input_file.
-\fI\+ \fRindica che il "seek" è relativo alla posizione corrente nel file
+\fI+ \fRindica che il "seek" è relativo alla posizione corrente nel file
 "standard input" (non significativa quando non si legge da "standard input").
 \fI\- \fRindica che il "seek" dovrebbe posizionarsi ad quel numero di
 caratteri dalla fine dell'input (o se in combinazione con
-\fI \+ \fR: prime della posizione corrente nel file "standard input").
+\fI+ \fR: prime della posizione corrente nel file "standard input").
 Se non si specifica una opzione \-s option, xxd inizia alla posizione
 corrente all'interno del file.
 .TP
@@ -183,7 +183,7 @@ e
 .PP
 .I xxd \-s \+seek
 può comportarsi in modo diverso da
-.I xxd \-s seek
+.IR "xxd \-s seek"
 , perché lseek(2) è usata per tornare indietro nel file di input.  Il '+'
 fa differenza se il file di input è lo "standard input", e se la pozione nel
 file di "standard input" non è all'inizio del file quando xxd è eseguito,
@@ -202,7 +202,7 @@ si aggiunge a 1k (1024) dove `dd' si era fermato.
 .br
 \fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +128 > esadecimale' < file
 .PP
-Immagine esadecimale dalla posizione 0x100 ( = 1024-768 ) del file in avanti.
+Immagine esadecimale dalla posizione 0x100 ( = 1024\-768 ) del file in avanti.
 .br
 \fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +-768 > esadecimale' < file
 .PP
diff --git a/src/Make_djg.mak b/src/Make_djg.mak
index 87b799b6c8fc70da21278128e89e2b50a4235243..0ba5140c5c0e00bb6fab69c91d8843606731e9a5 100644
--- a/src/Make_djg.mak
+++ b/src/Make_djg.mak
@@ -52,6 +52,7 @@ OBJ = \
 	obj/regexp.o \
 	obj/screen.o \
 	obj/search.o \
+	obj/spell.o \
 	obj/syntax.o \
 	obj/tag.o \
 	obj/term.o \
diff --git a/src/installml.sh b/src/installml.sh
index 5907b26a0ec119436fe897ba85f319cb43aa9511..bae0a8e364a9018ad7839988a4d7a28261de22e9 100644
--- a/src/installml.sh
+++ b/src/installml.sh
@@ -38,32 +38,32 @@ rgviewname=${14}
 gvimdiffname=${15}
 eviewname=${16}
 
-if test $what = "install"; then
+if test $what = "install" -a (-e $destdir/$vimname.1 -o -e $destdir/$vimdiffname.1 -o -e $destdir/$eviewname.1); then
    if test ! -d $destdir; then
       echo creating $destdir
       ./mkinstalldirs $destdir
    fi
 
    # ex
-   if test ! -e $destdir/$exname.1; then
+   if test ! -e $destdir/$exname.1 -a -e $destdir/$vimname.1; then
       echo creating link $destdir/$exname.1
       cd $destdir; ln -s $vimname.1 $exname.1
    fi
 
    # view
-   if test ! -e $destdir/$viewname.1; then
+   if test ! -e $destdir/$viewname.1 -a -e $destdir/$vimname.1; then
       echo creating link $destdir/$viewname.1
       cd $destdir; ln -s $vimname.1 $viewname.1
    fi
 
    # rvim
-   if test ! -e $destdir/$rvimname.1; then
+   if test ! -e $destdir/$rvimname.1 -a -e $destdir/$vimname.1; then
       echo creating link $destdir/$rvimname.1
       cd $destdir; ln -s $vimname.1 $rvimname.1
    fi
 
    # rview
-   if test ! -e $destdir/$rviewname.1; then
+   if test ! -e $destdir/$rviewname.1 -a -e $destdir/$vimname.1; then
       echo creating link $destdir/$rviewname.1
       cd $destdir; ln -s $vimname.1 $rviewname.1
    fi
@@ -71,37 +71,37 @@ if test $what = "install"; then
    # GUI targets are optional
    if test "$gui" = "yes"; then
       # gvim
-      if test ! -e $destdir/$gvimname.1; then
+      if test ! -e $destdir/$gvimname.1 -a -e $destdir/$vimname.1; then
 	 echo creating link $destdir/$gvimname.1
 	 cd $destdir; ln -s $vimname.1 $gvimname.1
       fi
 
       # gview
-      if test ! -e $destdir/$gviewname.1; then
+      if test ! -e $destdir/$gviewname.1 -a -e $destdir/$vimname.1; then
 	 echo creating link $destdir/$gviewname.1
 	 cd $destdir; ln -s $vimname.1 $gviewname.1
       fi
 
       # rgvim
-      if test ! -e $destdir/$rgvimname.1; then
+      if test ! -e $destdir/$rgvimname.1 -a -e $destdir/$vimname.1; then
 	 echo creating link $destdir/$rgvimname.1
 	 cd $destdir; ln -s $vimname.1 $rgvimname.1
       fi
 
       # rgview
-      if test ! -e $destdir/$rgviewname.1; then
+      if test ! -e $destdir/$rgviewname.1 -a -e $destdir/$vimname.1; then
 	 echo creating link $destdir/$rgviewname.1
 	 cd $destdir; ln -s $vimname.1 $rgviewname.1
       fi
 
       # gvimdiff
-      if test ! -e $destdir/$gvimdiffname.1; then
+      if test ! -e $destdir/$gvimdiffname.1 -a -e $destdir/$vimdiffname.1; then
 	 echo creating link $destdir/$gvimdiffname.1
 	 cd $destdir; ln -s $vimdiffname.1 $gvimdiffname.1
       fi
 
       # eview
-      if test ! -e $destdir/$eviewname.1; then
+      if test ! -e $destdir/$eviewname.1 -a -e $destdir/$evimname.1; then
 	 echo creating link $destdir/$eviewname.1
 	 cd $destdir; ln -s $evimname.1 $eviewname.1
       fi
diff --git a/src/ui.c b/src/ui.c
index 0941a37992effc06bf2963e28662d218045299b1..bb41f362f7876886e0c35c802c006cf769d9d081 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -153,8 +153,9 @@ ui_inchar(buf, maxlen, wtime, tb_change_cnt)
 	static int count = 0;
 
 # ifndef NO_CONSOLE
-	retval = mch_inchar(buf, maxlen, 10L, tb_change_cnt);
-	if (retval > 0 || typebuf_changed(tb_change_cnt))
+	retval = mch_inchar(buf, maxlen, (wtime >= 0 && wtime < 10)
+						? 10L : wtime, tb_change_cnt);
+	if (retval > 0 || typebuf_changed(tb_change_cnt) || wtime >= 0)
 	    goto theend;
 # endif
 	if (wtime == -1 && ++count == 1000)