diff options
| -rw-r--r-- | runtime/doc/vimdiff.man | 2 | ||||
| -rw-r--r-- | runtime/syntax/tcsh.vim | 2 | ||||
| -rw-r--r-- | src/Make_ivc.mak | 38 | ||||
| -rw-r--r-- | src/buffer.c | 1 | ||||
| -rw-r--r-- | src/glbl_ime.cpp | 4 | ||||
| -rw-r--r-- | src/normal.c | 2 | ||||
| -rw-r--r-- | src/os_riscos.h | 3 | ||||
| -rw-r--r-- | src/spell.c | 335 | ||||
| -rw-r--r-- | src/vim.h | 11 |
9 files changed, 248 insertions, 150 deletions
diff --git a/runtime/doc/vimdiff.man b/runtime/doc/vimdiff.man index fb0663c13f..41ef47f35d 100644 --- a/runtime/doc/vimdiff.man +++ b/runtime/doc/vimdiff.man @@ -30,7 +30,7 @@ DESCRIPTION OPTIONS Vertical splits are used to align the lines, as if the "-O" argument - was used. To use horizontal splits intead, use the "-o" argument. + was used. To use horizontal splits instead, use the "-o" argument. For all other arguments see vim(1). diff --git a/runtime/syntax/tcsh.vim b/runtime/syntax/tcsh.vim index 29fbb2e3c0..9c6701de52 100644 --- a/runtime/syntax/tcsh.vim +++ b/runtime/syntax/tcsh.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: C-shell (tcsh) -" Maintainor: Gautam Iyer <gautam@math.uchicago.edu> +" Maintainer: Gautam Iyer <gautam@math.uchicago.edu> " Last Modified: Mon 23 Feb 2004 02:28:51 PM CST " " Description: We break up each statement into a "command" and an "end" part. diff --git a/src/Make_ivc.mak b/src/Make_ivc.mak index a132949b8a..2ca070e683 100644 --- a/src/Make_ivc.mak +++ b/src/Make_ivc.mak @@ -105,14 +105,14 @@ INTDIR=.\oleRel VIM=gvim EXTRAS="$(INTDIR)/if_ole.obj" "$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" -CPP_PROJ=$(CPP_PROJ) /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ -# ADD CPP /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ +CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ +# ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ RSC_PROJ=$(RSC_PROJ) /I ".\oleRel" /d "NDEBUG" /d "FEAT_OLE" /fo.\oleRel\vim.res # ADD RSC /I ".\oleRel" /d "NDEBUG" /d "FEAT_OLE" /fo.\oleRel\vim.res -LINK32_FLAGS=$(LINK32_FLAGS) /pdb:none libc.lib oleaut32.lib /subsystem:windows /out:.\gvim.exe -# ADD LINK32 /pdb:none libc.lib oleaut32.lib /subsystem:windows /out:.\gvim.exe +LINK32_FLAGS=$(LINK32_FLAGS) /pdb:.\oleRel/gvim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvim.map libc.lib oleaut32.lib /subsystem:windows /out:.\gvim.exe +# ADD LINK32 /pdb:.\oleRel/gvim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvim.map libc.lib oleaut32.lib /subsystem:windows /out:.\gvim.exe !ELSEIF "$(CFG)" == "Vim - Win32 Debug gvim OLE" @@ -130,8 +130,8 @@ CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI_W32" /D "DYNAMIC_GETTEXT" RSC_PROJ=$(RSC_PROJ) /I .\oleDbg /d "_DEBUG" /d "FEAT_OLE" /fo.\oleDbg\vim.res # ADD RSC /I .\oleDbg /d "_DEBUG" /d "FEAT_OLE" /fo.\oleDbg\vim.res -LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib oleaut32.lib /subsystem:windows /debug /profile /pdb:.\oleDbg/gvimd.pdb /map:.\oleDbg\gvimd.map /out:.\gvimd.exe -# ADD LINK32 libcd.lib oleaut32.lib /subsystem:windows /debug /profile /pdb:.\oleDbg/gvimd.pdb /map:.\oleDbg\gvimd.map /out:.\gvimd.exe +LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib oleaut32.lib /subsystem:windows /debug /profile /pdb:.\oleDbg/gvimd.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvimd.map /out:.\gvimd.exe +# ADD LINK32 libcd.lib oleaut32.lib /subsystem:windows /debug /profile /pdb:.\oleDbg/gvimd.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvimd.map /out:.\gvimd.exe !ELSEIF "$(CFG)" == "Vim - Win32 Release gvim" @@ -144,14 +144,14 @@ INTDIR=.\gRel VIM=gvim EXTRAS="$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" -CPP_PROJ=$(CPP_PROJ) /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /Fd.\gRel/ /Fo.\gRel/ -# ADD CPP /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /Fd.\gRel/ /Fo.\gRel/ +CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /Fd.\gRel/ /Fo.\gRel/ +# ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /Fd.\gRel/ /Fo.\gRel/ RSC_PROJ=$(RSC_PROJ) /d "NDEBUG" /fo.\gRel\vim.res # ADD RSC /d "NDEBUG" /fo.\gRel\vim.res -LINK32_FLAGS=$(LINK32_FLAGS) /pdb:none libc.lib /subsystem:windows /out:.\gvim.exe -# ADD LINK32 /pdb:none libc.lib /subsystem:windows /out:.\gvim.exe +LINK32_FLAGS=$(LINK32_FLAGS) /pdb:.\gRel/gvim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvim.map libc.lib /subsystem:windows /out:.\gvim.exe +# ADD LINK32 /pdb:.\gRel/gvim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvim.map libc.lib /subsystem:windows /out:.\gvim.exe !ELSEIF "$(CFG)" == "Vim - Win32 Debug gvim" @@ -169,8 +169,8 @@ CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI_W32" /Fd.\gDbg/ /Fo.\gDbg/ RSC_PROJ=$(RSC_PROJ) /d "_DEBUG" /fo.\gDbg\vim.res # ADD RSC /d "_DEBUG" /fo.\gDbg\vim.res -LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib /subsystem:windows /debug /profile /pdb:.\gDbg/gvimd.pdb /map:.\gDbg\gvimd.map /out:.\gvimd.exe -# ADD LINK32 libcd.lib /subsystem:windows /debug /profile /pdb:.\gDbg/gvimd.pdb /map:.\gDbg\gvimd.map /out:.\gvimd.exe +LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib /subsystem:windows /debug /profile /pdb:.\gDbg/gvimd.pdb -debug:full -debugtype:cv,fixup /map:.\gDbg\gvimd.map /out:.\gvimd.exe +# ADD LINK32 libcd.lib /subsystem:windows /debug /profile /pdb:.\gDbg/gvimd.pdb -debug:full -debugtype:cv,fixup /map:.\gDbg\gvimd.map /out:.\gvimd.exe !ELSEIF "$(CFG)" == "Vim - Win32 Release vim" @@ -182,11 +182,11 @@ INTDIR=.\Rel VIM=vim EXTRAS= -CPP_PROJ=$(CPP_PROJ) /O2 /D "NDEBUG" /Fd.\Rel/ /Fo.\Rel/ -# ADD CPP /O2 /D "NDEBUG" /Fd.\Rel/ /Fo.\Rel/ +CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /Fd.\Rel/ /Fo.\Rel/ +# ADD CPP /Zi /O2 /D "NDEBUG" /Fd.\Rel/ /Fo.\Rel/ -LINK32_FLAGS=$(LINK32_FLAGS) /pdb:none libc.lib /subsystem:console /out:.\vim.exe -# ADD LINK32 /pdb:none libc.lib /subsystem:console /out:.\vim.exe +LINK32_FLAGS=$(LINK32_FLAGS) /pdb:.\Rel/vim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\vim.map libc.lib /subsystem:console /out:.\vim.exe +# ADD LINK32 /pdb:.\Rel/vim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\vim.map libc.lib /subsystem:console /out:.\vim.exe !ELSEIF "$(CFG)" == "Vim - Win32 Debug vim" @@ -201,8 +201,8 @@ EXTRAS= CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /Fd.\Dbg/ /Fo.\Dbg/ # ADD CPP /Zi /Od /D "_DEBUG" /Fd.\Dbg/ /Fo.\Dbg/ -LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib /subsystem:console /debug /profile /pdb:.\Dbg/vimd.pdb /map:.\Dbg/vimd.map /out:.\vimd.exe -# ADD LINK32 libcd.lib /subsystem:console /debug /profile /pdb:.\Dbg/vimd.pdb /map:.\Dbg/vimd.map /out:.\vimd.exe +LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib /subsystem:console /debug /profile /pdb:.\Dbg/vimd.pdb -debug:full -debugtype:cv,fixup /map:.\Dbg/vimd.map /out:.\vimd.exe +# ADD LINK32 libcd.lib /subsystem:console /debug /profile /pdb:.\Dbg/vimd.pdb -debug:full -debugtype:cv,fixup /map:.\Dbg/vimd.map /out:.\vimd.exe !ENDIF @@ -450,7 +450,7 @@ SOURCE=.\if_ole.cpp # Begin Custom Build "$(INTDIR)\if_ole.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\if_ole.h" - cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ /I ".\oleRel" .\if_ole.cpp + cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_W32" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ /I ".\oleRel" .\if_ole.cpp @rem This is the default rule with /I "$(IntDir)" added # End Custom Build diff --git a/src/buffer.c b/src/buffer.c index ea286c5880..f102b1ef0a 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -503,7 +503,6 @@ buf_clear_file(buf) buf->b_ml.ml_flags = ML_EMPTY; /* empty buffer */ #ifdef FEAT_NETBEANS_INTG netbeans_deleted_all_lines(buf); - netbeansOpenFile = 0; /* reset in netbeans_file_opened() */ #endif } diff --git a/src/glbl_ime.cpp b/src/glbl_ime.cpp index 16ca93241e..20247e552d 100644 --- a/src/glbl_ime.cpp +++ b/src/glbl_ime.cpp @@ -200,9 +200,10 @@ global_ime_set_font(LOGFONT *pFont) } } +#if 0 /* * for IME control. Save current status of IME, and set force new-status to - * Engllish (turn off). + * English (turn off). */ void WINAPI global_ime_status_evacuate() @@ -231,6 +232,7 @@ global_ime_status_restore() pIApp->ReleaseContext(s_hWnd, hImc); } } +#endif void WINAPI global_ime_set_status(int status) diff --git a/src/normal.c b/src/normal.c index ca26bb3a4b..71cc3c783b 100644 --- a/src/normal.c +++ b/src/normal.c @@ -228,7 +228,7 @@ static const struct nv_cmd {NL, nv_down, 0, FALSE}, {Ctrl_K, nv_error, 0, 0}, {Ctrl_L, nv_clear, 0, 0}, - {CAR, nv_down, 0, TRUE}, + {Ctrl_M, nv_down, 0, TRUE}, {Ctrl_N, nv_down, NV_STS, FALSE}, {Ctrl_O, nv_ctrlo, 0, 0}, {Ctrl_P, nv_up, NV_STS, FALSE}, diff --git a/src/os_riscos.h b/src/os_riscos.h index e7501d7f82..47a48da79f 100644 --- a/src/os_riscos.h +++ b/src/os_riscos.h @@ -80,9 +80,6 @@ #ifndef GVIMRC_FILE # define GVIMRC_FILE "/gvimrc" #endif -#ifndef VIEW_FILE -# define VIEW_FILE "/View" -#endif #ifndef USR_VIMRC_FILE # define USR_VIMRC_FILE "Vim:Evim" #endif diff --git a/src/spell.c b/src/spell.c index 6446cd977e..8eaa46e3a5 100644 --- a/src/spell.c +++ b/src/spell.c @@ -318,6 +318,8 @@ struct slang_S char_u sl_regions[17]; /* table with up to 8 region names plus NUL */ + char_u *sl_midword; /* MIDWORD string or NULL */ + int sl_prefixcnt; /* number of items in "sl_prefprog" */ regprog_T **sl_prefprog; /* table with regprogs for prefixes */ @@ -464,6 +466,7 @@ typedef struct matchinf_S /* others */ int mi_result; /* result so far: SP_BAD, SP_OK, etc. */ int mi_capflags; /* WF_ONECAP WF_ALLCAP WF_KEEPCAP */ + buf_T *mi_buf; /* buffer being checked */ } matchinf_T; /* @@ -480,17 +483,17 @@ typedef struct spelltab_S static spelltab_T spelltab; static int did_set_spelltab; -static char_u spell_ismw[256]; /* flags: is midword char */ -#ifdef FEAT_MBYTE -static char_u *spell_ismw_mb = NULL; /* multi-byte midword chars */ -#endif #define CF_WORD 0x01 #define CF_UPPER 0x02 static void clear_spell_chartab __ARGS((spelltab_T *sp)); static int set_spell_finish __ARGS((spelltab_T *new_st)); -static int spell_iswordp __ARGS((char_u *p)); +static int spell_iswordp __ARGS((char_u *p, buf_T *buf)); +static int spell_iswordp_nmw __ARGS((char_u *p)); +#ifdef FEAT_MBYTE +static int spell_iswordp_w __ARGS((int *p, buf_T *buf)); +#endif static void write_spell_prefcond __ARGS((FILE *fd, garray_T *gap)); /* @@ -571,6 +574,10 @@ typedef struct trystate_S #define FIND_KEEPWORD 1 /* find keep-case word */ #define FIND_PREFIX 2 /* find word after prefix */ +/* values for read_cnt_string() */ +#define ERR_NOMEM -1 +#define ERR_TRUNC -2 + static slang_T *slang_alloc __ARGS((char_u *lang)); static void slang_free __ARGS((slang_T *lp)); static void slang_clear __ARGS((slang_T *lp)); @@ -584,10 +591,13 @@ static void spell_load_lang __ARGS((char_u *lang)); static char_u *spell_enc __ARGS((void)); static void spell_load_cb __ARGS((char_u *fname, void *cookie)); static slang_T *spell_load_file __ARGS((char_u *fname, char_u *lang, slang_T *old_lp, int silent)); +static char_u *read_cnt_string __ARGS((FILE *fd, int cnt_bytes, int *errp)); #ifdef FEAT_MBYTE static int *mb_str2wide __ARGS((char_u *s)); #endif static idx_T read_tree __ARGS((FILE *fd, char_u *byts, idx_T *idxs, int maxidx, int startidx, int prefixtree, int maxprefcondnr)); +static void clear_midword __ARGS((buf_T *buf)); +static void use_midword __ARGS((slang_T *lp, buf_T *buf)); static int find_region __ARGS((char_u *rp, char_u *region)); static int captype __ARGS((char_u *word, char_u *end)); static void spell_reload_one __ARGS((char_u *fname, int added_word)); @@ -714,7 +724,7 @@ spell_check(wp, ptr, attrp) mi.mi_end = skipdigits(ptr); nrlen = mi.mi_end - ptr; } - if (!spell_iswordp(mi.mi_end)) + if (!spell_iswordp(mi.mi_end, wp->w_buffer)) return (int)(mi.mi_end - ptr); /* Try including the digits in the word. */ @@ -725,12 +735,12 @@ spell_check(wp, ptr, attrp) /* Find the normal end of the word (until the next non-word character). */ mi.mi_word = ptr; - if (spell_iswordp(mi.mi_fend)) + if (spell_iswordp(mi.mi_fend, wp->w_buffer)) { do { mb_ptr_adv(mi.mi_fend); - } while (*mi.mi_fend != NUL && spell_iswordp(mi.mi_fend)); + } while (*mi.mi_fend != NUL && spell_iswordp(mi.mi_fend, wp->w_buffer)); } /* We always use the characters up to the next non-word character, @@ -740,6 +750,7 @@ spell_check(wp, ptr, attrp) /* Check caps type later. */ mi.mi_capflags = 0; mi.mi_cend = NULL; + mi.mi_buf = wp->w_buffer; /* Include one non-word character so that we can check for the * word end. */ @@ -966,7 +977,7 @@ find_word(mip, mode) if ((*mb_head_off)(ptr, ptr + wlen) > 0) continue; /* not at first byte of character */ #endif - if (spell_iswordp(ptr + wlen)) + if (spell_iswordp(ptr + wlen, mip->mi_buf)) continue; /* next char is a word character */ #ifdef FEAT_MBYTE @@ -1227,7 +1238,7 @@ fold_more(mip) do { mb_ptr_adv(mip->mi_fend); - } while (*mip->mi_fend != NUL && spell_iswordp(mip->mi_fend)); + } while (*mip->mi_fend != NUL && spell_iswordp(mip->mi_fend, mip->mi_buf)); /* Include the non-word character so that we can check for the * word end. */ @@ -1450,7 +1461,7 @@ spell_cat_line(buf, line, maxlen) if (*p != NUL) { *buf = ' '; - vim_strncpy(buf + 1, line, maxlen - 1); + vim_strncpy(buf + 1, line, maxlen - 2); n = p - line; if (n >= maxlen) n = maxlen - 1; @@ -1585,9 +1596,13 @@ slang_clear(lp) gap = &lp->sl_sal; if (lp->sl_sofo) - /* SOFOFROM and SOFOTO items: free lists of wide characters. */ - for (i = 0; i < gap->ga_len; ++i) - vim_free(((int **)gap->ga_data)[i]); + { + /* "ga_len" is set to 1 without adding an item for latin1 */ + if (gap->ga_data != NULL) + /* SOFOFROM and SOFOTO items: free lists of wide characters. */ + for (i = 0; i < gap->ga_len; ++i) + vim_free(((int **)gap->ga_data)[i]); + } else /* SAL items: free salitem_T items */ while (gap->ga_len > 0) @@ -1606,7 +1621,12 @@ slang_clear(lp) for (i = 0; i < lp->sl_prefixcnt; ++i) vim_free(lp->sl_prefprog[i]); + lp->sl_prefixcnt = 0; vim_free(lp->sl_prefprog); + lp->sl_prefprog = NULL; + + vim_free(lp->sl_midword); + lp->sl_midword = NULL; #ifdef FEAT_MBYTE { @@ -1761,21 +1781,16 @@ formerr: for (i = 0; i < cnt; ++i) p[i] = getc(fd); /* <charflags> */ - ccnt = (getc(fd) << 8) + getc(fd); /* <fcharslen> */ - if (ccnt <= 0) - { - vim_free(p); - goto formerr; - } - fol = alloc((unsigned)ccnt + 1); - if (fol == NULL) + /* <fcharslen> <fchars> */ + fol = read_cnt_string(fd, 2, &ccnt); + if (ccnt != 0) { vim_free(p); - goto endFAIL; + if (ccnt == ERR_NOMEM) + goto endFAIL; + if (ccnt == ERR_TRUNC) + goto formerr; } - for (i = 0; i < ccnt; ++i) - fol[i] = getc(fd); /* <fchars> */ - fol[i] = NUL; /* Set the word-char flags and fill SPELL_ISUPPER() table. */ i = set_spell_charflags(p, cnt, fol); @@ -1795,50 +1810,11 @@ formerr: } /* <midwordlen> <midword> */ - cnt = (getc(fd) << 8) + getc(fd); - if (cnt < 0) + lp->sl_midword = read_cnt_string(fd, 2, &cnt); + if (cnt == ERR_TRUNC) goto truncerr; - if (cnt > 0) - { - for (i = 0; i < cnt; ++i) - if (i < MAXWLEN) /* truncate at reasonable length */ - buf[i] = getc(fd); - if (i < MAXWLEN) - buf[i] = NUL; - else - buf[MAXWLEN] = NUL; - - /* The midword characters add up to any midword characters from other - * .spel files. */ - for (p = buf; *p != NUL; ) -#ifdef FEAT_MBYTE - if (has_mbyte) - { - c = mb_ptr2char(p); - i = mb_ptr2len_check(p); - if (c < 256) - spell_ismw[c] = TRUE; - else if (spell_ismw_mb == NULL) - /* First multi-byte char in "spell_ismw_mb". */ - spell_ismw_mb = vim_strnsave(p, i); - else - { - /* Append multi-byte chars to "spell_ismw_mb". */ - n = STRLEN(spell_ismw_mb); - bp = vim_strnsave(spell_ismw_mb, n + i); - if (bp != NULL) - { - vim_free(spell_ismw_mb); - spell_ismw_mb = bp; - vim_strncpy(bp + n, p, i); - } - } - p += i; - } - else -#endif - spell_ismw[*p++] = TRUE; - } + if (cnt == ERR_NOMEM) + goto endFAIL; /* <prefcondcnt> <prefcond> ... */ cnt = (getc(fd) << 8) + getc(fd); /* <prefcondcnt> */ @@ -2292,6 +2268,50 @@ endOK: return lp; } +/* + * Read a length field from "fd" in "cnt_bytes" bytes. + * Allocate memory and read the string into it. + * Returns NULL when the count is zero. + * Sets "errp" to ERR_TRUNC when reading failed, ERR_NOMEM when out of + * memory, zero when OK. + */ + static char_u * +read_cnt_string(fd, cnt_bytes, errp) + FILE *fd; + int cnt_bytes; + int *errp; +{ + int cnt = 0; + int i; + char_u *str; + + /* read the length bytes, MSB first */ + for (i = 0; i < cnt_bytes; ++i) + cnt = (cnt << 8) + getc(fd); + if (cnt < 0) + { + *errp = ERR_TRUNC; + return NULL; + } + + /* allocate memory */ + str = alloc((unsigned)cnt + 1); + if (str == NULL) + { + *errp = ERR_NOMEM; + return NULL; + } + *errp = 0; + + /* Read the string. Doesn't check for truncated file. */ + for (i = 0; i < cnt; ++i) + str[i] = getc(fd); + str[i] = NUL; + + return str; +} + + #ifdef FEAT_MBYTE /* * Turn a multi-byte string into a wide character string. @@ -2454,6 +2474,7 @@ did_set_spelllang(buf) char_u *p; ga_init2(&ga, sizeof(langp_T), 2); + clear_midword(buf); /* Make the name of the .spl file associated with 'spellfile'. */ if (*buf->b_p_spf == NUL) @@ -2542,6 +2563,7 @@ did_set_spelllang(buf) LANGP_ENTRY(ga, ga.ga_len)->lp_slang = lp; LANGP_ENTRY(ga, ga.ga_len)->lp_region = region_mask; ++ga.ga_len; + use_midword(lp, buf); /* Check if this is the spell file related to 'spellfile'. */ if (load_spf && fullpathcmp(spf_name, lp->sl_fname, FALSE) @@ -2575,6 +2597,7 @@ did_set_spelllang(buf) LANGP_ENTRY(ga, ga.ga_len)->lp_slang = lp; LANGP_ENTRY(ga, ga.ga_len)->lp_region = REGION_ALL; ++ga.ga_len; + use_midword(lp, buf); } } @@ -2595,6 +2618,64 @@ did_set_spelllang(buf) } /* + * Clear the midword characters for buffer "buf". + */ + static void +clear_midword(buf) + buf_T *buf; +{ + vim_memset(buf->b_spell_ismw, 0, 256); +#ifdef FEAT_MBYTE + vim_free(buf->b_spell_ismw_mb); + buf->b_spell_ismw_mb = NULL; +#endif +} + +/* + * Use the "sl_midword" field of language "lp" for buffer "buf". + * They add up to any currently used midword characters. + */ + static void +use_midword(lp, buf) + slang_T *lp; + buf_T *buf; +{ + char_u *p; + + for (p = lp->sl_midword; *p != NUL; ) +#ifdef FEAT_MBYTE + if (has_mbyte) + { + int c, l, n; + char_u *bp; + + c = mb_ptr2char(p); + l = mb_ptr2len_check(p); + if (c < 256) + buf->b_spell_ismw[c] = TRUE; + else if (buf->b_spell_ismw_mb == NULL) + /* First multi-byte char in "b_spell_ismw_mb". */ + buf->b_spell_ismw_mb = vim_strnsave(p, l); + else + { + /* Append multi-byte chars to "b_spell_ismw_mb". */ + n = STRLEN(buf->b_spell_ismw_mb); + bp = vim_strnsave(buf->b_spell_ismw_mb, n + l); + if (bp != NULL) + { + vim_free(buf->b_spell_ismw_mb); + buf->b_spell_ismw_mb = bp; + vim_strncpy(bp + n, p, l); + } + } + p += l; + } + else +#endif + buf->b_spell_ismw[*p++] = TRUE; +} + +/* * Find the region "region[2]" in "rp" (points to "sl_regions"). * Each region is simply stored as the two characters of it's name. * Returns the index if found, REGION_ALL if not found. @@ -2635,7 +2716,7 @@ captype(word, end) int past_second = FALSE; /* past second word char */ /* find first letter */ - for (p = word; !spell_iswordp(p); mb_ptr_adv(p)) + for (p = word; !spell_iswordp_nmw(p); mb_ptr_adv(p)) if (end == NULL ? *p == NUL : p >= end) return 0; /* only non-word characters, illegal word */ #ifdef FEAT_MBYTE @@ -2651,7 +2732,7 @@ captype(word, end) * But a word with an upper char only at start is a ONECAP. */ for ( ; end == NULL ? *p != NUL : p < end; mb_ptr_adv(p)) - if (spell_iswordp(p)) + if (spell_iswordp_nmw(p)) { #ifdef FEAT_MBYTE c = mb_ptr2char(p); @@ -3837,12 +3918,7 @@ store_aff_word(word, spin, afflist, affile, ht, xht, comb, flags, pfxlist) { /* Remove chop string. */ p = newword + STRLEN(newword); -#ifdef FEAT_MBYTE - if (has_mbyte) - i = mb_charlen(ae->ae_chop); - else -#endif - i = STRLEN(ae->ae_chop); + i = MB_CHARLEN(ae->ae_chop); for ( ; i > 0; --i) mb_ptr_back(newword, p); *p = NUL; @@ -5275,11 +5351,7 @@ init_spell_chartab() did_set_spelltab = FALSE; clear_spell_chartab(&spelltab); - vim_memset(spell_ismw, FALSE, sizeof(spell_ismw)); #ifdef FEAT_MBYTE - vim_free(spell_ismw_mb); - spell_ismw_mb = NULL; - if (enc_dbcs) { /* DBCS: assume double-wide characters are word characters. */ @@ -5475,8 +5547,9 @@ set_spell_finish(new_st) * Thus this only works properly when past the first character of the word. */ static int -spell_iswordp(p) +spell_iswordp(p, buf) char_u *p; + buf_T *buf; /* buffer used */ { #ifdef FEAT_MBYTE char_u *s; @@ -5490,7 +5563,7 @@ spell_iswordp(p) if (l == 1) { /* be quick for ASCII */ - if (spell_ismw[*p]) + if (buf->b_spell_ismw[*p]) { s = p + 1; /* skip a mid-word character */ l = MB_BYTE2LEN(*s); @@ -5499,8 +5572,9 @@ spell_iswordp(p) else { c = mb_ptr2char(p); - if (c < 256 ? spell_ismw[c] : (spell_ismw_mb != NULL - && vim_strchr(spell_ismw_mb, c) != NULL)) + if (c < 256 ? buf->b_spell_ismw[c] + : (buf->b_spell_ismw_mb != NULL + && vim_strchr(buf->b_spell_ismw_mb, c) != NULL)) { s = p + l; l = MB_BYTE2LEN(*s); @@ -5513,7 +5587,23 @@ spell_iswordp(p) } #endif - return spelltab.st_isw[spell_ismw[*p] ? p[1] : p[0]]; + return spelltab.st_isw[buf->b_spell_ismw[*p] ? p[1] : p[0]]; +} + +/* + * Return TRUE if "p" points to a word character. + * Unlike spell_iswordp() this doesn't check for "midword" characters. + */ + static int +spell_iswordp_nmw(p) + char_u *p; +{ +#ifdef FEAT_MBYTE + if (has_mbyte && MB_BYTE2LEN(*p) > 1) + return mb_get_class(p) >= 2; +#endif + + return spelltab.st_isw[*p]; } #ifdef FEAT_MBYTE @@ -5522,13 +5612,15 @@ spell_iswordp(p) * Wide version of spell_iswordp(). */ static int -spell_iswordp_w(p) +spell_iswordp_w(p, buf) int *p; + buf_T *buf; { int *s; - if (*p < 256 ? spell_ismw[*p] : (spell_ismw_mb != NULL - && vim_strchr(spell_ismw_mb, *p) != NULL)) + if (*p < 256 ? buf->b_spell_ismw[*p] + : (buf->b_spell_ismw_mb != NULL + && vim_strchr(buf->b_spell_ismw_mb, *p) != NULL)) s = p + 1; else s = p; @@ -6267,7 +6359,7 @@ onecap_copy(word, wcopy, upper) l = 1; wcopy[0] = c; } - vim_strncpy(wcopy + l, p, MAXWLEN - l); + vim_strncpy(wcopy + l, p, MAXWLEN - l - 1); } /* @@ -6320,7 +6412,7 @@ suggest_try_special(su) suginfo_T *su; { char_u *p; - int len; + size_t len; int c; char_u word[MAXWLEN]; @@ -6576,7 +6668,7 @@ suggest_try_change(su) newscore += SCORE_ICASE; if ((fword[sp->ts_fidx] == NUL - || !spell_iswordp(fword + sp->ts_fidx)) + || !spell_iswordp(fword + sp->ts_fidx, curbuf)) && sp->ts_fidx >= sp->ts_fidxtry) { /* The badword also ends: add suggestions. Give a penalty @@ -6589,7 +6681,7 @@ suggest_try_change(su) else #endif --p; - if (!spell_iswordp(p)) + if (!spell_iswordp(p, curbuf)) { p = preword + STRLEN(preword); #ifdef FEAT_MBYTE @@ -6598,7 +6690,7 @@ suggest_try_change(su) else #endif --p; - if (spell_iswordp(p)) + if (spell_iswordp(p, curbuf)) newscore += SCORE_NONWORD; } @@ -6622,18 +6714,36 @@ suggest_try_change(su) sp->ts_save_prewordlen = prewordlen; sp->ts_save_badflags = su->su_badflags; sp->ts_save_splitoff = splitoff; + sp->ts_state = STATE_SPLITUNDO; + + ++depth; + sp = &stack[depth]; /* Append a space to preword. */ STRCAT(preword, " "); prewordlen = STRLEN(preword); splitoff = sp->ts_twordlen; + + /* If the badword has a non-word character at this + * position skip it. That means replacing the + * non-word character with a space. */ + if (!spell_iswordp_nmw(fword + sp->ts_fidx)) + { + sp->ts_score -= SCORE_SPLIT - SCORE_SUBST; +#ifdef FEAT_MBYTE + if (has_mbyte) + sp->ts_fidx += MB_BYTE2LEN(fword[sp->ts_fidx]); + else +#endif + ++sp->ts_fidx; + } #ifdef FEAT_MBYTE if (has_mbyte) { int i = 0; /* Case-folding may change the number of bytes: - * Count nr of chars in fword[sp->ts_fidx] and + * Count nr of chars in fword[ts_fidx] and * advance that many chars in su->su_badptr. */ for (p = fword; p < fword + sp->ts_fidx; mb_ptr_adv(p)) @@ -6647,10 +6757,8 @@ suggest_try_change(su) su->su_badflags = captype(p, su->su_badptr + su->su_badlen); - sp->ts_state = STATE_SPLITUNDO; - ++depth; /* Restart at top of the tree. */ - stack[depth].ts_arridx = 0; + sp->ts_arridx = 0; } } break; @@ -7975,7 +8083,7 @@ add_suggestion(su, gap, goodword, badlen, score, altscore, had_bonus) /* When replacing part of the word check that we actually change * something. For "the the" a suggestion can be replacing the first * "the" with itself, since "the" wasn't banned. */ - if (badlen == STRLEN(goodword) + if (badlen == (int)STRLEN(goodword) && STRNCMP(su->su_badword, goodword, badlen) == 0) return; } @@ -7995,6 +8103,7 @@ add_suggestion(su, gap, goodword, badlen, score, altscore, had_bonus) if (stp[i].st_score > score) { stp[i].st_score = score; + stp[i].st_altscore = altscore; stp[i].st_had_bonus = had_bonus; } break; @@ -8355,7 +8464,7 @@ spell_soundfold_sal(slang, inword, res) } else { - if (spell_iswordp(s)) + if (spell_iswordp_nmw(s)) *t++ = *s; ++s; } @@ -8433,12 +8542,12 @@ spell_soundfold_sal(slang, inword, res) if (*s == NUL || (*s == '^' && (i == 0 || !(word[i - 1] == ' ' - || spell_iswordp(word + i - 1))) + || spell_iswordp(word + i - 1, curbuf))) && (*(s + 1) != '$' - || (!spell_iswordp(word + i + k0)))) + || (!spell_iswordp(word + i + k0, curbuf)))) || (*s == '$' && i > 0 - && spell_iswordp(word + i - 1) - && (!spell_iswordp(word + i + k0)))) + && spell_iswordp(word + i - 1, curbuf) + && (!spell_iswordp(word + i + k0, curbuf)))) { /* search for followup rules, if: */ /* followup and k > 1 and NO '-' in searchstring */ @@ -8500,7 +8609,8 @@ spell_soundfold_sal(slang, inword, res) if (*s == NUL /* *s == '^' cuts */ || (*s == '$' - && !spell_iswordp(word + i + k0))) + && !spell_iswordp(word + i + k0, + curbuf))) { if (k0 == k) /* this is just a piece of the string */ @@ -8647,7 +8757,7 @@ spell_soundfold_wsal(slang, inword, res) else { did_white = FALSE; - if (!spell_iswordp(t)) + if (!spell_iswordp_nmw(t)) continue; } } @@ -8724,12 +8834,12 @@ spell_soundfold_wsal(slang, inword, res) if (*s == NUL || (*s == '^' && (i == 0 || !(word[i - 1] == ' ' - || spell_iswordp_w(word + i - 1))) + || spell_iswordp_w(word + i - 1, curbuf))) && (*(s + 1) != '$' - || (!spell_iswordp_w(word + i + k0)))) + || (!spell_iswordp_w(word + i + k0, curbuf)))) || (*s == '$' && i > 0 - && spell_iswordp_w(word + i - 1) - && (!spell_iswordp_w(word + i + k0)))) + && spell_iswordp_w(word + i - 1, curbuf) + && (!spell_iswordp_w(word + i + k0, curbuf)))) { /* search for followup rules, if: */ /* followup and k > 1 and NO '-' in searchstring */ @@ -8795,7 +8905,8 @@ spell_soundfold_wsal(slang, inword, res) if (*s == NUL /* *s == '^' cuts */ || (*s == '$' - && !spell_iswordp_w(word + i + k0))) + && !spell_iswordp_w(word + i + k0, + curbuf))) { if (k0 == k) /* this is just a piece of the string */ @@ -9455,7 +9566,7 @@ apply_prefixes(slang, word, round, flags, startlnum) i = valid_word_prefix(i, n, prefid, word, slang); if (i != 0) { - vim_strncpy(prefix + depth, word, MAXWLEN - depth); + vim_strncpy(prefix + depth, word, MAXWLEN - depth - 1); dump_word(prefix, round, (i & WF_RAREPFX) ? (flags | WF_RARE) : flags, lnum++); @@ -501,13 +501,6 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname); #define CLEAR 50 /* screen messed up, clear it */ /* - * Hints used to optimize screen updating. - */ -#define HINT_NONE 0 /* no current hint */ -#define HINT_DEL_CHAR 1 /* delete character */ -#define HINT_INS_CHAR 2 /* insert character */ - -/* * Flags for w_valid. * These are set when something in a window structure becomes invalid, except * when the cursor is moved. Call check_cursor_moved() before testing one of @@ -622,7 +615,6 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname); /* * values for xp_context when doing command line completion */ -#define CONTEXT_UNKNOWN (-3) #define EXPAND_UNSUCCESSFUL (-2) #define EXPAND_OK (-1) #define EXPAND_NOTHING 0 @@ -734,7 +726,6 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname); # endif # define SST_FIX_STATES 7 /* size of sst_stack[]. */ # define SST_DIST 16 /* normal distance between entries */ -# define SST_INVALID (synstate_T *)-1 /* invalid syn_state pointer */ #endif /* Values for 'options' argument in do_search() and searchit() */ @@ -981,7 +972,6 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname); /* * Return values for functions like gui_yesnocancel() */ -#define VIM_OK 1 #define VIM_YES 2 #define VIM_NO 3 #define VIM_CANCEL 4 @@ -1853,7 +1843,6 @@ typedef int proftime_T; /* dummy for function prototypes */ # include "nbdebug.h" #else # define nbdebug(a) -# define nbprint(a) #endif #ifdef IN_PERL_FILE |