diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-03-22 23:06:55 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-03-22 23:06:55 +0000 |
| commit | 43b604cddcd655225cde7696a54b429746cb8876 (patch) | |
| tree | 1766d7f34511db87e8c3569d6b7408d6b48d9be2 /src | |
| parent | 6bb683663ad7ae9c303284c335a731a13233c6c2 (diff) | |
| download | vim-git-43b604cddcd655225cde7696a54b429746cb8876.tar.gz | |
updated for version 7.0063v7.0063
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make_djg.mak | 1 | ||||
| -rw-r--r-- | src/installml.sh | 22 | ||||
| -rw-r--r-- | src/ui.c | 5 |
3 files changed, 15 insertions, 13 deletions
diff --git a/src/Make_djg.mak b/src/Make_djg.mak index 87b799b6c..0ba5140c5 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 5907b26a0..bae0a8e36 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 @@ -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) |