thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0214

Browse Source
This commit is contained in:
Bram Moolenaar
2006-03-04 21:46:13 +00:00
parent 0e34f6269e
commit d0131a8bd2
3 changed files with 111 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/index.txt
View File

@@ -1,4 +1,4 @@
*index.txt* For Vim version 7.0aa. Last change: 2006 Feb 28
*index.txt* For Vim version 7.0aa. Last change: 2006 Mar 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1420,6 +1420,7 @@ The commands are sorted on the non-optional part of their name.
|:spelldump| :spelld[ump] split window and fill with all correct words
|:spellgood| :spe[llgood] add good word for spelling
|:spellrepall| :spellr[epall] replace all bad words like last |z=|
|:spellundo| :spellu[ndo] remove good or bad word
|:spellwrong| :spellw[rong] add spelling mistake
|:split| :sp[lit] split current window
|:sprevious| :spr[evious] split window and go to previous file in the
@@ -1444,6 +1445,7 @@ The commands are sorted on the non-optional part of their name.
|:tNext| :tN[ext] jump to previous matching tag
|:tabNext| :tabN[ext] go to previous tab page
|:tabclose| :tabc[lose] close current tab page
|:tabdo| :tabdo execute command in each tab page
|:tabedit| :tabe[dit] edit a file in a new tab page
|:tabfind| :tabf[ind] find file in 'path', edit it in a new tab page
|:tabfirst| :tabfir[st] got to first tab page

28
src/normal.c
View File

@@ -4512,6 +4512,9 @@ nv_zet(cap)
long old_fdl = curwin->w_p_fdl;
int old_fen = curwin->w_p_fen;
#endif
#ifdef FEAT_SYN_HL
int undo = FALSE;
#endif
if (VIM_ISDIGIT(nchar))
{
@@ -4883,6 +4886,26 @@ dozet:
#endif /* FEAT_FOLDING */
#ifdef FEAT_SYN_HL
case 'u': /* "zug" and "zuw": undo "zg" and "zw" */
++no_mapping;
++allow_keys; /* no mapping for nchar, but allow key codes */
nchar = safe_vgetc();
#ifdef FEAT_LANGMAP
LANGMAP_ADJUST(nchar, TRUE);
#endif
--no_mapping;
--allow_keys;
#ifdef FEAT_CMDL_INFO
(void)add_to_showcmd(nchar);
#endif
if (vim_strchr((char_u *)"gGwW", nchar) == NULL)
{
clearopbeep(cap->oap);
break;
}
undo = TRUE;
/*FALLTHROUGH*/
case 'g': /* "zg": add good word to word list */
case 'w': /* "zw": add wrong word to word list */
case 'G': /* "zG": add good word to temp word list */
@@ -4913,8 +4936,9 @@ dozet:
FIND_IDENT)) == 0)
return;
spell_add_word(ptr, len, nchar == 'w' || nchar == 'W',
(nchar == 'G' || nchar == 'W') ? 0
: (int)cap->count1);
(nchar == 'G' || nchar == 'W')
? 0 : (int)cap->count1,
undo);
}
break;

83
src/spell.c
View File

@@ -8759,25 +8759,28 @@ spell_message(spin, str)
/*
* ":[count]spellgood {word}"
* ":[count]spellwrong {word}"
* ":[count]spellundo {word}"
*/
void
ex_spell(eap)
exarg_T *eap;
{
spell_add_word(eap->arg, STRLEN(eap->arg), eap->cmdidx == CMD_spellwrong,
eap->forceit ? 0 : (int)eap->line2);
eap->forceit ? 0 : (int)eap->line2,
eap->cmdidx == CMD_spellundo);
}
/*
* Add "word[len]" to 'spellfile' as a good or bad word.
*/
void
spell_add_word(word, len, bad, index)
spell_add_word(word, len, bad, index, undo)
char_u *word;
int len;
int bad;
int index; /* "zG" and "zW": zero, otherwise index in
'spellfile' */
int undo; /* TRUE for "zug", "zuG", "zuw" and "zuW" */
{
FILE *fd;
buf_T *buf = NULL;
@@ -8839,9 +8842,9 @@ spell_add_word(word, len, bad, index)
fname = fnamebuf;
}
if (bad)
if (bad || undo)
{
/* When the word also appears as good word we need to remove that one,
/* When the word appears as good word we need to remove that one,
* since its flags sort before the one with WF_BANNED. */
fd = mch_fopen((char *)fname, "r");
if (fd != NULL)
@@ -8861,7 +8864,11 @@ spell_add_word(word, len, bad, index)
if (fd == NULL)
break;
if (fseek(fd, fpos, SEEK_SET) == 0)
{
fputc('#', fd);
if (undo)
smsg((char_u *)_("Word removed from %s"), NameBuff);
}
fseek(fd, fpos_next, SEEK_SET);
}
}
@@ -8869,16 +8876,19 @@ spell_add_word(word, len, bad, index)
}
}
if (!undo)
{
fd = mch_fopen((char *)fname, "a");
if (fd == NULL && new_spf)
{
/* We just initialized the 'spellfile' option and can't open the file.
* We may need to create the "spell" directory first. We already
* checked the runtime directory is writable in init_spellfile(). */
/* We just initialized the 'spellfile' option and can't open the
* file. We may need to create the "spell" directory first. We
* already checked the runtime directory is writable in
* init_spellfile(). */
if (!dir_of_file_exists(fname))
{
/* The directory doesn't exist. Try creating it and opening the
* file again. */
/* The directory doesn't exist. Try creating it and opening
* the file again. */
vim_mkdir(NameBuff, 0755);
fd = mch_fopen((char *)fname, "a");
}
@@ -8894,6 +8904,13 @@ spell_add_word(word, len, bad, index)
fprintf(fd, "%.*s\n", len, word);
fclose(fd);
home_replace(NULL, fname, NameBuff, MAXPATHL, TRUE);
smsg((char_u *)_("Word added to %s"), NameBuff);
}
}
if (fd != NULL)
{
/* Update the .add.spl file. */
mkspell(1, &fname, FALSE, TRUE, TRUE);
@@ -14809,6 +14826,8 @@ pop:
#define DUMPFLAG_KEEPCASE 1 /* round 2: keep-case tree */
#define DUMPFLAG_COUNT 2 /* include word count */
#define DUMPFLAG_ICASE 4 /* ignore case when finding matches */
#define DUMPFLAG_ONECAP 8 /* pattern starts with capital */
#define DUMPFLAG_ALLCAP 16 /* pattern is all capitals */
/*
* ":spelldump"
@@ -14870,8 +14889,27 @@ spell_dump_compl(buf, pat, ic, dir, dumpflags_arg)
int dumpflags = dumpflags_arg;
int patlen;
/* When ignoring case or when the pattern starts with capital pass this on
* to dump_word(). */
if (pat != NULL)
{
if (ic)
dumpflags |= DUMPFLAG_ICASE;
else
{
n = captype(pat, NULL);
if (n == WF_ONECAP)
dumpflags |= DUMPFLAG_ONECAP;
else if (n == WF_ALLCAP
#ifdef FEAT_MBYTE
&& STRLEN(pat) > mb_ptr2len(pat)
#else
&& STRLEN(pat) > 1
#endif
)
dumpflags |= DUMPFLAG_ALLCAP;
}
}
/* Find out if we can support regions: All languages must support the same
* regions or none at all. */
@@ -15006,9 +15044,12 @@ spell_dump_compl(buf, pat, ic, dir, dumpflags_arg)
/* Check if this characters matches with the pattern.
* If not skip the whole tree below it.
* TODO ignorecase
* TODO: multi-byte */
if (depth <= patlen && STRNCMP(word, pat, depth) != 0)
* Always ignore case here, dump_word() will check
* proper case later. This isn't exactly right when
* length changes for multi-byte characters with
* ignore case... */
if (depth <= patlen
&& MB_STRNICMP(word, pat, depth) != 0)
--depth;
}
}
@@ -15022,13 +15063,13 @@ spell_dump_compl(buf, pat, ic, dir, dumpflags_arg)
* When "lnum" is zero add insert mode completion.
*/
static void
dump_word(slang, word, pat, dir, dumpflags, flags, lnum)
dump_word(slang, word, pat, dir, dumpflags, wordflags, lnum)
slang_T *slang;
char_u *word;
char_u *pat;
int *dir;
int dumpflags;
int flags;
int wordflags;
linenr_T lnum;
{
int keepcap = FALSE;
@@ -15037,6 +15078,12 @@ dump_word(slang, word, pat, dir, dumpflags, flags, lnum)
char_u cword[MAXWLEN];
char_u badword[MAXWLEN + 10];
int i;
int flags = wordflags;
if (dumpflags & DUMPFLAG_ONECAP)
flags |= WF_ONECAP;
if (dumpflags & DUMPFLAG_ALLCAP)
flags |= WF_ALLCAP;
if ((dumpflags & DUMPFLAG_KEEPCASE) == 0 && (flags & WF_CAPMASK) != 0)
{
@@ -15090,17 +15137,15 @@ dump_word(slang, word, pat, dir, dumpflags, flags, lnum)
ml_append(lnum, p, (colnr_T)0, FALSE);
}
else
{
/* TODO: ignore case, multi-byte */
if (STRNCMP(p, pat, STRLEN(pat)) == 0
else if (((dumpflags & DUMPFLAG_ICASE)
? MB_STRNICMP(p, pat, STRLEN(pat)) == 0
: STRNCMP(p, pat, STRLEN(pat)) == 0)
&& ins_compl_add_infercase(p, (int)STRLEN(p),
dumpflags & DUMPFLAG_ICASE,
NULL, *dir, 0) == OK)
/* if dir was BACKWARD then honor it just once */
*dir = FORWARD;
}
}
/*
* For ":spelldump": Find matching prefixes for "word". Prepend each to