mirror of
https://github.com/zoriya/vim.git
synced 2025-12-19 21:55:18 +00:00
updated for version 7.0089
This commit is contained in:
Bram Moolenaar
@@ -1,4 +1,4 @@
|
|||||||
*eval.txt* For Vim version 7.0aa. Last change: 2005 Jun 17
|
*eval.txt* For Vim version 7.0aa. Last change: 2005 Jun 20
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@@ -1603,6 +1603,8 @@ setreg( {n}, {v}[, {opt}]) Number set register to value and type
|
|||||||
setwinvar( {nr}, {varname}, {val}) set {varname} in window {nr} to {val}
|
setwinvar( {nr}, {varname}, {val}) set {varname} in window {nr} to {val}
|
||||||
simplify( {filename}) String simplify filename as much as possible
|
simplify( {filename}) String simplify filename as much as possible
|
||||||
sort( {list} [, {func}]) List sort {list}, using {func} to compare
|
sort( {list} [, {func}]) List sort {list}, using {func} to compare
|
||||||
|
spellbadword() String badly spelled word at cursor
|
||||||
|
spellsuggest({word} [, {max}]) List spelling suggestions
|
||||||
split( {expr} [, {pat} [, {keepempty}]])
|
split( {expr} [, {pat} [, {keepempty}]])
|
||||||
List make List from {pat} separated {expr}
|
List make List from {pat} separated {expr}
|
||||||
strftime( {format}[, {time}]) String time in specified format
|
strftime( {format}[, {time}]) String time in specified format
|
||||||
@@ -3757,6 +3759,27 @@ sort({list} [, {func}]) *sort()* *E702*
|
|||||||
return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
|
return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
|
||||||
endfunc
|
endfunc
|
||||||
let sortedlist = sort(mylist, "MyCompare")
|
let sortedlist = sort(mylist, "MyCompare")
|
||||||
|
<
|
||||||
|
|
||||||
|
*spellbadword()*
|
||||||
|
spellbadword() Return the badly spelled word under or after the cursor.
|
||||||
|
The cursor is advanced to the start of the bad word.
|
||||||
|
When no bad word is found in the cursor line an empty String
|
||||||
|
is returned and the cursor doesn't move.
|
||||||
|
|
||||||
|
*spellsuggest()*
|
||||||
|
spellsuggest({word} [, {max}])
|
||||||
|
Return a List with spelling suggestions to replace {word}.
|
||||||
|
When {max} is given up to this number of suggestions are
|
||||||
|
returned. Otherwise up to 25 suggestions are returned.
|
||||||
|
|
||||||
|
{word} can be a badly spelled word followed by other text.
|
||||||
|
This allows for joining two words that were split. The
|
||||||
|
suggestions then also include the following text.
|
||||||
|
|
||||||
|
The spelling information for the current window is used. The
|
||||||
|
'spell' option must be set and 'spelllang' is relevant.
|
||||||
|
|
||||||
|
|
||||||
split({expr} [, {pattern} [, {keepempty}]]) *split()*
|
split({expr} [, {pattern} [, {keepempty}]]) *split()*
|
||||||
Make a List out of {expr}. When {pattern} is omitted or empty
|
Make a List out of {expr}. When {pattern} is omitted or empty
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
*options.txt* For Vim version 7.0aa. Last change: 2005 Jun 17
|
*options.txt* For Vim version 7.0aa. Last change: 2005 Jun 21
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@@ -5662,6 +5662,25 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||||||
idea to set 'spelllang' after setting 'encoding'.
|
idea to set 'spelllang' after setting 'encoding'.
|
||||||
More info at |spell|.
|
More info at |spell|.
|
||||||
|
|
||||||
|
*'spellsuggest'* *'sps'*
|
||||||
|
'spellsuggest' 'sps' string (default "best")
|
||||||
|
global
|
||||||
|
{not in Vi}
|
||||||
|
{not available when compiled without the |+syntax|
|
||||||
|
feature}
|
||||||
|
Method used for spelling suggestions |z?|. Can be one of these
|
||||||
|
values:
|
||||||
|
|
||||||
|
best Method that works best for English. Finds small
|
||||||
|
changes and uses some sound-a-like scoring.
|
||||||
|
double Uses two methods and mixes the results. The first
|
||||||
|
method is finding small changes, the other method
|
||||||
|
computes how much the suggestion sounds like the bad
|
||||||
|
word. Can be slow and doesn't always give better
|
||||||
|
results.
|
||||||
|
fast Only check for small changes.
|
||||||
|
|
||||||
|
|
||||||
*'splitbelow'* *'sb'* *'nosplitbelow'* *'nosb'*
|
*'splitbelow'* *'sb'* *'nosplitbelow'* *'nosb'*
|
||||||
'splitbelow' 'sb' boolean (default off)
|
'splitbelow' 'sb' boolean (default off)
|
||||||
global
|
global
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
*spell.txt* For Vim version 7.0aa. Last change: 2005 Jun 19
|
*spell.txt* For Vim version 7.0aa. Last change: 2005 Jun 21
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@@ -92,6 +92,12 @@ z? For the badly spelled word under the cursor suggest
|
|||||||
higher the score the more different).
|
higher the score the more different).
|
||||||
The score may be slightly wrong for words with
|
The score may be slightly wrong for words with
|
||||||
multi-byte characters.
|
multi-byte characters.
|
||||||
|
When a word was replaced the redo command "." will
|
||||||
|
repeat the word replacement. This works like "ciw",
|
||||||
|
the good word and <Esc>.
|
||||||
|
|
||||||
|
The 'spellsuggest' option influences how the list of suggestions is generated
|
||||||
|
and sorted. See |'spellsuggest'|.
|
||||||
|
|
||||||
|
|
||||||
PERFORMANCE
|
PERFORMANCE
|
||||||
@@ -337,7 +343,7 @@ Example:
|
|||||||
/regions=uscagb regions "us", "ca" and "gb"
|
/regions=uscagb regions "us", "ca" and "gb"
|
||||||
example word for all regions
|
example word for all regions
|
||||||
/1blah word for region 1 "us"
|
/1blah word for region 1 "us"
|
||||||
/!Vim bad word
|
/!vim bad word
|
||||||
/?3Campbell rare word in region 3 "gb"
|
/?3Campbell rare word in region 3 "gb"
|
||||||
/='s mornings keep-case word
|
/='s mornings keep-case word
|
||||||
|
|
||||||
|
|||||||
@@ -5130,6 +5130,7 @@ hebrew hebrew.txt /*hebrew*
|
|||||||
hebrew.txt hebrew.txt /*hebrew.txt*
|
hebrew.txt hebrew.txt /*hebrew.txt*
|
||||||
help various.txt /*help*
|
help various.txt /*help*
|
||||||
help-context help.txt /*help-context*
|
help-context help.txt /*help-context*
|
||||||
|
help-tags tags 1
|
||||||
help-translated various.txt /*help-translated*
|
help-translated various.txt /*help-translated*
|
||||||
help-xterm-window various.txt /*help-xterm-window*
|
help-xterm-window various.txt /*help-xterm-window*
|
||||||
help.txt help.txt /*help.txt*
|
help.txt help.txt /*help.txt*
|
||||||
@@ -6274,6 +6275,8 @@ spell-quickstart spell.txt /*spell-quickstart*
|
|||||||
spell-syntax spell.txt /*spell-syntax*
|
spell-syntax spell.txt /*spell-syntax*
|
||||||
spell-wordlist-format spell.txt /*spell-wordlist-format*
|
spell-wordlist-format spell.txt /*spell-wordlist-format*
|
||||||
spell.txt spell.txt /*spell.txt*
|
spell.txt spell.txt /*spell.txt*
|
||||||
|
spellbadword() eval.txt /*spellbadword()*
|
||||||
|
spellsuggest() eval.txt /*spellsuggest()*
|
||||||
split() eval.txt /*split()*
|
split() eval.txt /*split()*
|
||||||
splitfind windows.txt /*splitfind*
|
splitfind windows.txt /*splitfind*
|
||||||
splitview windows.txt /*splitview*
|
splitview windows.txt /*splitview*
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
*todo.txt* For Vim version 7.0aa. Last change: 2005 Jun 19
|
*todo.txt* For Vim version 7.0aa. Last change: 2005 Jun 22
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@@ -30,9 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
|
|||||||
*known-bugs*
|
*known-bugs*
|
||||||
-------------------- Known bugs and current work -----------------------
|
-------------------- Known bugs and current work -----------------------
|
||||||
|
|
||||||
Can define a function with illegal name (Servatius Brandt):
|
|
||||||
function F{-1}()
|
|
||||||
|
|
||||||
Add extra list of file locations. Can be used with:
|
Add extra list of file locations. Can be used with:
|
||||||
:ltag list of matching tags, like :tselect
|
:ltag list of matching tags, like :tselect
|
||||||
|
|
||||||
@@ -56,6 +53,8 @@ Win32: Balloon text can't contain line break.
|
|||||||
Patch from Sergey Khorev, 2005 Apr 11
|
Patch from Sergey Khorev, 2005 Apr 11
|
||||||
Add has("balloon_multiline")
|
Add has("balloon_multiline")
|
||||||
|
|
||||||
|
Win32: Crash when pasting Simplified Chinese in utf-8. (rainux, 2005 June 20)
|
||||||
|
|
||||||
Mac unicode patch (Da Woon Jung):
|
Mac unicode patch (Da Woon Jung):
|
||||||
- selecting proportional font breaks display
|
- selecting proportional font breaks display
|
||||||
- UTF-8 text causes display problems. Font replacement causes this.
|
- UTF-8 text causes display problems. Font replacement causes this.
|
||||||
@@ -100,14 +99,22 @@ PLANNED FOR VERSION 7.0:
|
|||||||
- Add SPELLCHECKER, with support for many languages.
|
- Add SPELLCHECKER, with support for many languages.
|
||||||
- Spell checking code todo's:
|
- Spell checking code todo's:
|
||||||
- Code for making suggestions:
|
- Code for making suggestions:
|
||||||
- Hebrew: also use prefixes for suggestions.
|
- ":mkspell" runs out of memory for Polish with utf-8.
|
||||||
- When 'spellfile' directory doesn't exist, ask user to create it?
|
- When 'spellfile' directory doesn't exist, ask user to create it?
|
||||||
|
- When 'spelllang' has more than one language only .add file of
|
||||||
|
first is used?
|
||||||
- Aspell has the "special" character, useful?
|
- Aspell has the "special" character, useful?
|
||||||
|
- Can "the the" be added as a bad word?
|
||||||
|
Add BAD item in .aff file, set WF_BANNED flag.
|
||||||
|
- Simple and fast sound-a-like: mapping list for first char and rest
|
||||||
|
vowel as first char: *
|
||||||
|
remove other vowels
|
||||||
|
- How about words that are split over two lines? E.g., "et al.".
|
||||||
- When putting map string in .spl file check for duplicate chars.
|
- When putting map string in .spl file check for duplicate chars.
|
||||||
- GUI: Selecting text doesn't work at the prompt.
|
- Hebrew: also use prefixes for suggestions. See message from
|
||||||
- Should "z?" replacement be redo-able with "."?
|
Kaminsky (June 20) for ideas.
|
||||||
- The sound-folding doesn't work for multi-byte characters. It's
|
- The sound-folding doesn't work for multi-byte characters. It's
|
||||||
very slow too. Prepare the table (remove alternatives)?
|
very slow too.
|
||||||
- Also put list of word characters in word list file. Otherwise the
|
- Also put list of word characters in word list file. Otherwise the
|
||||||
one for Italian may differ from the one used for English.
|
one for Italian may differ from the one used for English.
|
||||||
- Make "en-rare" spell file.
|
- Make "en-rare" spell file.
|
||||||
@@ -121,8 +128,8 @@ PLANNED FOR VERSION 7.0:
|
|||||||
http://spellchecker.mozdev.org/source.html
|
http://spellchecker.mozdev.org/source.html
|
||||||
http://whiteboard.openoffice.org/source/browse/whiteboard/lingucomponent/source/spellcheck/myspell/
|
http://whiteboard.openoffice.org/source/browse/whiteboard/lingucomponent/source/spellcheck/myspell/
|
||||||
author: Kevin Hendricks <kevin.hendricks@sympatico.ca>
|
author: Kevin Hendricks <kevin.hendricks@sympatico.ca>
|
||||||
- Update option window for 'verbosefile', 'spell', 'spellfile' and
|
- Update option window for 'verbosefile', 'spell', 'spellfile',
|
||||||
'spelllang'.
|
'spellsuggest' and 'spelllang'.
|
||||||
- Distribution: Need wordlists for many languages; "language pack"
|
- Distribution: Need wordlists for many languages; "language pack"
|
||||||
Put them on the ftp site, ready to download. Include README for
|
Put them on the ftp site, ready to download. Include README for
|
||||||
copyrights.
|
copyrights.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
*version7.txt* For Vim version 7.0aa. Last change: 2005 Jun 17
|
*version7.txt* For Vim version 7.0aa. Last change: 2005 Jun 21
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@@ -1137,5 +1137,8 @@ so that mapping is done in the right mode.
|
|||||||
setbufvar() and setwinvar() did not give error messages.
|
setbufvar() and setwinvar() did not give error messages.
|
||||||
|
|
||||||
It was possible to set a variable with an illegal name, e.g. with setbufvar().
|
It was possible to set a variable with an illegal name, e.g. with setbufvar().
|
||||||
|
It was possible to define a function with illegal name, e.t. ":func F{-1}()"
|
||||||
|
|
||||||
|
CTRL-W F and "gf" didn't use the same method to get the file name.
|
||||||
|
|
||||||
vim:tw=78:ts=8:ft=help:norl:
|
vim:tw=78:ts=8:ft=help:norl:
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,13 +1,10 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: C
|
" Language: C
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
" Last Change: 2005 Jan 26
|
" Last Change: 2005 Jun 20
|
||||||
|
|
||||||
" For version 5.x: Clear all syntax items
|
" Quit when a (custom) syntax file was already loaded
|
||||||
" For version 6.x: Quit when a syntax file was already loaded
|
if exists("b:current_syntax")
|
||||||
if version < 600
|
|
||||||
syntax clear
|
|
||||||
elseif exists("b:current_syntax")
|
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -298,63 +295,51 @@ endif
|
|||||||
exec "syn sync ccomment cComment minlines=" . b:c_minlines
|
exec "syn sync ccomment cComment minlines=" . b:c_minlines
|
||||||
|
|
||||||
" Define the default highlighting.
|
" Define the default highlighting.
|
||||||
" For version 5.7 and earlier: only when not done already
|
" Only used when an item doesn't have highlighting yet
|
||||||
" For version 5.8 and later: only when an item doesn't have highlighting yet
|
hi def link cFormat cSpecial
|
||||||
if version >= 508 || !exists("did_c_syn_inits")
|
hi def link cCppString cString
|
||||||
if version < 508
|
hi def link cCommentL cComment
|
||||||
let did_c_syn_inits = 1
|
hi def link cCommentStart cComment
|
||||||
command -nargs=+ HiLink hi link <args>
|
hi def link cLabel Label
|
||||||
else
|
hi def link cUserLabel Label
|
||||||
command -nargs=+ HiLink hi def link <args>
|
hi def link cConditional Conditional
|
||||||
endif
|
hi def link cRepeat Repeat
|
||||||
|
hi def link cCharacter Character
|
||||||
HiLink cFormat cSpecial
|
hi def link cSpecialCharacter cSpecial
|
||||||
HiLink cCppString cString
|
hi def link cNumber Number
|
||||||
HiLink cCommentL cComment
|
hi def link cOctal Number
|
||||||
HiLink cCommentStart cComment
|
hi def link cOctalZero PreProc " link this to Error if you want
|
||||||
HiLink cLabel Label
|
hi def link cFloat Float
|
||||||
HiLink cUserLabel Label
|
hi def link cOctalError cError
|
||||||
HiLink cConditional Conditional
|
hi def link cParenError cError
|
||||||
HiLink cRepeat Repeat
|
hi def link cErrInParen cError
|
||||||
HiLink cCharacter Character
|
hi def link cErrInBracket cError
|
||||||
HiLink cSpecialCharacter cSpecial
|
hi def link cCommentError cError
|
||||||
HiLink cNumber Number
|
hi def link cCommentStartError cError
|
||||||
HiLink cOctal Number
|
hi def link cSpaceError cError
|
||||||
HiLink cOctalZero PreProc " link this to Error if you want
|
hi def link cSpecialError cError
|
||||||
HiLink cFloat Float
|
hi def link cOperator Operator
|
||||||
HiLink cOctalError cError
|
hi def link cStructure Structure
|
||||||
HiLink cParenError cError
|
hi def link cStorageClass StorageClass
|
||||||
HiLink cErrInParen cError
|
hi def link cInclude Include
|
||||||
HiLink cErrInBracket cError
|
hi def link cPreProc PreProc
|
||||||
HiLink cCommentError cError
|
hi def link cDefine Macro
|
||||||
HiLink cCommentStartError cError
|
hi def link cIncluded cString
|
||||||
HiLink cSpaceError cError
|
hi def link cError Error
|
||||||
HiLink cSpecialError cError
|
hi def link cStatement Statement
|
||||||
HiLink cOperator Operator
|
hi def link cPreCondit PreCondit
|
||||||
HiLink cStructure Structure
|
hi def link cType Type
|
||||||
HiLink cStorageClass StorageClass
|
hi def link cConstant Constant
|
||||||
HiLink cInclude Include
|
hi def link cCommentString cString
|
||||||
HiLink cPreProc PreProc
|
hi def link cComment2String cString
|
||||||
HiLink cDefine Macro
|
hi def link cCommentSkip cComment
|
||||||
HiLink cIncluded cString
|
hi def link cString String
|
||||||
HiLink cError Error
|
hi def link cComment Comment
|
||||||
HiLink cStatement Statement
|
hi def link cSpecial SpecialChar
|
||||||
HiLink cPreCondit PreCondit
|
hi def link cTodo Todo
|
||||||
HiLink cType Type
|
hi def link cCppSkip cCppOut
|
||||||
HiLink cConstant Constant
|
hi def link cCppOut2 cCppOut
|
||||||
HiLink cCommentString cString
|
hi def link cCppOut Comment
|
||||||
HiLink cComment2String cString
|
|
||||||
HiLink cCommentSkip cComment
|
|
||||||
HiLink cString String
|
|
||||||
HiLink cComment Comment
|
|
||||||
HiLink cSpecial SpecialChar
|
|
||||||
HiLink cTodo Todo
|
|
||||||
HiLink cCppSkip cCppOut
|
|
||||||
HiLink cCppOut2 cCppOut
|
|
||||||
HiLink cCppOut Comment
|
|
||||||
|
|
||||||
delcommand HiLink
|
|
||||||
endif
|
|
||||||
|
|
||||||
let b:current_syntax = "c"
|
let b:current_syntax = "c"
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: generic configure file
|
" Language: generic configure file
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
" Last Change: 2001 Apr 25
|
" Last Change: 2005 Jun 20
|
||||||
|
|
||||||
" For version 5.x: Clear all syntax items
|
" Quit when a (custom) syntax file was already loaded
|
||||||
" For version 6.x: Quit when a syntax file was already loaded
|
if exists("b:current_syntax")
|
||||||
if version < 600
|
|
||||||
syntax clear
|
|
||||||
elseif exists("b:current_syntax")
|
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -19,22 +16,10 @@ syn region confString start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline
|
|||||||
syn region confString start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline
|
syn region confString start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline
|
||||||
|
|
||||||
" Define the default highlighting.
|
" Define the default highlighting.
|
||||||
" For version 5.7 and earlier: only when not done already
|
" Only used when an item doesn't have highlighting yet
|
||||||
" For version 5.8 and later: only when an item doesn't have highlighting yet
|
hi def link confComment Comment
|
||||||
if version >= 508 || !exists("did_conf_syntax_inits")
|
hi def link confTodo Todo
|
||||||
if version < 508
|
hi def link confString String
|
||||||
let did_conf_syntax_inits = 1
|
|
||||||
command -nargs=+ HiLink hi link <args>
|
|
||||||
else
|
|
||||||
command -nargs=+ HiLink hi def link <args>
|
|
||||||
endif
|
|
||||||
|
|
||||||
HiLink confComment Comment
|
|
||||||
HiLink confTodo Todo
|
|
||||||
HiLink confString String
|
|
||||||
|
|
||||||
delcommand HiLink
|
|
||||||
endif
|
|
||||||
|
|
||||||
let b:current_syntax = "conf"
|
let b:current_syntax = "conf"
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: CTRL-H (e.g., ASCII manpages)
|
" Language: CTRL-H (e.g., ASCII manpages)
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
" Last Change: 2001 Apr 25
|
" Last Change: 2005 Jun 20
|
||||||
|
|
||||||
" Existing syntax is kept, this file can be used as an addition
|
" Existing syntax is kept, this file can be used as an addition
|
||||||
|
|
||||||
@@ -15,19 +15,9 @@ syntax match CtrlHBold /\(.\)\b\1/ contains=CtrlHHide
|
|||||||
syntax match CtrlHHide /.\b/ contained
|
syntax match CtrlHHide /.\b/ contained
|
||||||
|
|
||||||
" Define the default highlighting.
|
" Define the default highlighting.
|
||||||
" For version 5.7 and earlier: only when not done already
|
" Only used when an item doesn't have highlighting yet
|
||||||
" For version 5.8 and later: only when an item doesn't have highlighting yet
|
hi def link CtrlHHide Ignore
|
||||||
if version >= 508 || !exists("did_ctrlh_syntax_inits")
|
hi def CtrlHUnderline term=underline cterm=underline gui=underline
|
||||||
if version < 508
|
hi def CtrlHBold term=bold cterm=bold gui=bold
|
||||||
let did_ctrlh_syntax_inits = 1
|
|
||||||
hi link CtrlHHide Ignore
|
|
||||||
hi CtrlHUnderline term=underline cterm=underline gui=underline
|
|
||||||
hi CtrlHBold term=bold cterm=bold gui=bold
|
|
||||||
else
|
|
||||||
hi def link CtrlHHide Ignore
|
|
||||||
hi def CtrlHUnderline term=underline cterm=underline gui=underline
|
|
||||||
hi def CtrlHBold term=bold cterm=bold gui=bold
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
" vim: ts=8
|
" vim: ts=8
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Diff (context or unified)
|
" Language: Diff (context or unified)
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
" Last Change: 2003 Apr 02
|
" Last Change: 2005 Jun 20
|
||||||
|
|
||||||
" For version 5.x: Clear all syntax items
|
" Quit when a (custom) syntax file was already loaded
|
||||||
" For version 6.x: Quit when a syntax file was already loaded
|
if exists("b:current_syntax")
|
||||||
if version < 600
|
|
||||||
syntax clear
|
|
||||||
elseif exists("b:current_syntax")
|
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -43,35 +40,23 @@ syn match diffNewFile "^--- .*"
|
|||||||
syn match diffComment "^#.*"
|
syn match diffComment "^#.*"
|
||||||
|
|
||||||
" Define the default highlighting.
|
" Define the default highlighting.
|
||||||
" For version 5.7 and earlier: only when not done already
|
" Only used when an item doesn't have highlighting yet
|
||||||
" For version 5.8 and later: only when an item doesn't have highlighting yet
|
hi def link diffOldFile diffFile
|
||||||
if version >= 508 || !exists("did_diff_syntax_inits")
|
hi def link diffNewFile diffFile
|
||||||
if version < 508
|
hi def link diffFile Type
|
||||||
let did_diff_syntax_inits = 1
|
hi def link diffOnly Constant
|
||||||
command -nargs=+ HiLink hi link <args>
|
hi def link diffIdentical Constant
|
||||||
else
|
hi def link diffDiffer Constant
|
||||||
command -nargs=+ HiLink hi def link <args>
|
hi def link diffBDiffer Constant
|
||||||
endif
|
hi def link diffIsA Constant
|
||||||
|
hi def link diffNoEOL Constant
|
||||||
HiLink diffOldFile diffFile
|
hi def link diffCommon Constant
|
||||||
HiLink diffNewFile diffFile
|
hi def link diffRemoved Special
|
||||||
HiLink diffFile Type
|
hi def link diffChanged PreProc
|
||||||
HiLink diffOnly Constant
|
hi def link diffAdded Identifier
|
||||||
HiLink diffIdentical Constant
|
hi def link diffLine Statement
|
||||||
HiLink diffDiffer Constant
|
hi def link diffSubname PreProc
|
||||||
HiLink diffBDiffer Constant
|
hi def link diffComment Comment
|
||||||
HiLink diffIsA Constant
|
|
||||||
HiLink diffNoEOL Constant
|
|
||||||
HiLink diffCommon Constant
|
|
||||||
HiLink diffRemoved Special
|
|
||||||
HiLink diffChanged PreProc
|
|
||||||
HiLink diffAdded Identifier
|
|
||||||
HiLink diffLine Statement
|
|
||||||
HiLink diffSubname PreProc
|
|
||||||
HiLink diffComment Comment
|
|
||||||
|
|
||||||
delcommand HiLink
|
|
||||||
endif
|
|
||||||
|
|
||||||
let b:current_syntax = "diff"
|
let b:current_syntax = "diff"
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Vim help file
|
" Language: Vim help file
|
||||||
" Maintainer: Bram Moolenaar (Bram@vim.org)
|
" Maintainer: Bram Moolenaar (Bram@vim.org)
|
||||||
" Last Change: 2005 Mar 31
|
" Last Change: 2005 Jun 20
|
||||||
|
|
||||||
" For version 5.x: Clear all syntax items
|
" Quit when a (custom) syntax file was already loaded
|
||||||
" For version 6.x: Quit when a syntax file was already loaded
|
if exists("b:current_syntax")
|
||||||
if version < 600
|
|
||||||
syntax clear
|
|
||||||
elseif exists("b:current_syntax")
|
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -120,67 +117,55 @@ syn sync minlines=40
|
|||||||
|
|
||||||
|
|
||||||
" Define the default highlighting.
|
" Define the default highlighting.
|
||||||
" For version 5.7 and earlier: only when not done already
|
" Only used when an item doesn't have highlighting yet
|
||||||
" For version 5.8 and later: only when an item doesn't have highlighting yet
|
hi def link helpExampleStart helpIgnore
|
||||||
if version >= 508 || !exists("did_help_syntax_inits")
|
hi def link helpIgnore Ignore
|
||||||
if version < 508
|
hi def link helpHyperTextJump Subtitle
|
||||||
let did_help_syntax_inits = 1
|
hi def link helpHyperTextEntry String
|
||||||
command -nargs=+ HiLink hi link <args>
|
hi def link helpHeadline Statement
|
||||||
else
|
hi def link helpHeader PreProc
|
||||||
command -nargs=+ HiLink hi def link <args>
|
hi def link helpSectionDelim PreProc
|
||||||
endif
|
hi def link helpVim Identifier
|
||||||
|
hi def link helpExample Comment
|
||||||
|
hi def link helpOption Type
|
||||||
|
hi def link helpNotVi Special
|
||||||
|
hi def link helpSpecial Special
|
||||||
|
hi def link helpNote Todo
|
||||||
|
hi def link Subtitle Identifier
|
||||||
|
|
||||||
HiLink helpExampleStart helpIgnore
|
hi def link helpComment Comment
|
||||||
HiLink helpIgnore Ignore
|
hi def link helpConstant Constant
|
||||||
HiLink helpHyperTextJump Subtitle
|
hi def link helpString String
|
||||||
HiLink helpHyperTextEntry String
|
hi def link helpCharacter Character
|
||||||
HiLink helpHeadline Statement
|
hi def link helpNumber Number
|
||||||
HiLink helpHeader PreProc
|
hi def link helpBoolean Boolean
|
||||||
HiLink helpSectionDelim PreProc
|
hi def link helpFloat Float
|
||||||
HiLink helpVim Identifier
|
hi def link helpIdentifier Identifier
|
||||||
HiLink helpExample Comment
|
hi def link helpFunction Function
|
||||||
HiLink helpOption Type
|
hi def link helpStatement Statement
|
||||||
HiLink helpNotVi Special
|
hi def link helpConditional Conditional
|
||||||
HiLink helpSpecial Special
|
hi def link helpRepeat Repeat
|
||||||
HiLink helpNote Todo
|
hi def link helpLabel Label
|
||||||
HiLink Subtitle Identifier
|
hi def link helpOperator Operator
|
||||||
|
hi def link helpKeyword Keyword
|
||||||
HiLink helpComment Comment
|
hi def link helpException Exception
|
||||||
HiLink helpConstant Constant
|
hi def link helpPreProc PreProc
|
||||||
HiLink helpString String
|
hi def link helpInclude Include
|
||||||
HiLink helpCharacter Character
|
hi def link helpDefine Define
|
||||||
HiLink helpNumber Number
|
hi def link helpMacro Macro
|
||||||
HiLink helpBoolean Boolean
|
hi def link helpPreCondit PreCondit
|
||||||
HiLink helpFloat Float
|
hi def link helpType Type
|
||||||
HiLink helpIdentifier Identifier
|
hi def link helpStorageClass StorageClass
|
||||||
HiLink helpFunction Function
|
hi def link helpStructure Structure
|
||||||
HiLink helpStatement Statement
|
hi def link helpTypedef Typedef
|
||||||
HiLink helpConditional Conditional
|
hi def link helpSpecialChar SpecialChar
|
||||||
HiLink helpRepeat Repeat
|
hi def link helpTag Tag
|
||||||
HiLink helpLabel Label
|
hi def link helpDelimiter Delimiter
|
||||||
HiLink helpOperator Operator
|
hi def link helpSpecialComment SpecialComment
|
||||||
HiLink helpKeyword Keyword
|
hi def link helpDebug Debug
|
||||||
HiLink helpException Exception
|
hi def link helpUnderlined Underlined
|
||||||
HiLink helpPreProc PreProc
|
hi def link helpError Error
|
||||||
HiLink helpInclude Include
|
hi def link helpTodo Todo
|
||||||
HiLink helpDefine Define
|
|
||||||
HiLink helpMacro Macro
|
|
||||||
HiLink helpPreCondit PreCondit
|
|
||||||
HiLink helpType Type
|
|
||||||
HiLink helpStorageClass StorageClass
|
|
||||||
HiLink helpStructure Structure
|
|
||||||
HiLink helpTypedef Typedef
|
|
||||||
HiLink helpSpecialChar SpecialChar
|
|
||||||
HiLink helpTag Tag
|
|
||||||
HiLink helpDelimiter Delimiter
|
|
||||||
HiLink helpSpecialComment SpecialComment
|
|
||||||
HiLink helpDebug Debug
|
|
||||||
HiLink helpUnderlined Underlined
|
|
||||||
HiLink helpError Error
|
|
||||||
HiLink helpTodo Todo
|
|
||||||
|
|
||||||
delcommand HiLink
|
|
||||||
endif
|
|
||||||
|
|
||||||
let b:current_syntax = "help"
|
let b:current_syntax = "help"
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +1,13 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Model
|
" Language: Model
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
" Last Change: 2001 Apr 25
|
" Last Change: 2005 Jun 20
|
||||||
|
|
||||||
" very basic things only (based on the vgrindefs file).
|
" very basic things only (based on the vgrindefs file).
|
||||||
" If you use this language, please improve it, and send me the patches!
|
" If you use this language, please improve it, and send me the patches!
|
||||||
|
|
||||||
" For version 5.x: Clear all syntax items
|
" Quit when a (custom) syntax file was already loaded
|
||||||
" For version 6.x: Quit when a syntax file was already loaded
|
if exists("b:current_syntax")
|
||||||
if version < 600
|
|
||||||
syntax clear
|
|
||||||
elseif exists("b:current_syntax")
|
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -36,23 +33,11 @@ syn region modelString start=+"+ end=+"+
|
|||||||
syn match modelString "'."
|
syn match modelString "'."
|
||||||
|
|
||||||
" Define the default highlighting.
|
" Define the default highlighting.
|
||||||
" For version 5.7 and earlier: only when not done already
|
" Only used when an item doesn't have highlighting yet
|
||||||
" For version 5.8 and later: only when an item doesn't have highlighting yet
|
hi def link modelKeyword Statement
|
||||||
if version >= 508 || !exists("did_model_syntax_inits")
|
hi def link modelBlock PreProc
|
||||||
if version < 508
|
hi def link modelComment Comment
|
||||||
let did_model_syntax_inits = 1
|
hi def link modelString String
|
||||||
command -nargs=+ HiLink hi link <args>
|
|
||||||
else
|
|
||||||
command -nargs=+ HiLink hi def link <args>
|
|
||||||
endif
|
|
||||||
|
|
||||||
HiLink modelKeyword Statement
|
|
||||||
HiLink modelBlock PreProc
|
|
||||||
HiLink modelComment Comment
|
|
||||||
HiLink modelString String
|
|
||||||
|
|
||||||
delcommand HiLink
|
|
||||||
endif
|
|
||||||
|
|
||||||
let b:current_syntax = "model"
|
let b:current_syntax = "model"
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,12 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Vgrindefs
|
" Language: Vgrindefs
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
" Last Change: 2001 Apr 25
|
" Last Change: 2005 Jun 20
|
||||||
|
|
||||||
" The Vgrindefs file is used to specify a language for vgrind
|
" The Vgrindefs file is used to specify a language for vgrind
|
||||||
|
|
||||||
" For version 5.x: Clear all syntax items
|
" Quit when a (custom) syntax file was already loaded
|
||||||
" For version 6.x: Quit when a syntax file was already loaded
|
if exists("b:current_syntax")
|
||||||
if version < 600
|
|
||||||
syntax clear
|
|
||||||
elseif exists("b:current_syntax")
|
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -39,22 +36,9 @@ syn match vgrindefsField ":$"
|
|||||||
syn match vgrindefsField "\\$"
|
syn match vgrindefsField "\\$"
|
||||||
|
|
||||||
" Define the default highlighting.
|
" Define the default highlighting.
|
||||||
" For version 5.7 and earlier: only when not done already
|
" Only used when an item doesn't have highlighting yet
|
||||||
" For version 5.8 and later: only when an item doesn't have highlighting yet
|
hi def link vgrindefsField Statement
|
||||||
if version >= 508 || !exists("did_vgrindefs_syntax_inits")
|
hi def link vgrindefsComment Comment
|
||||||
if version < 508
|
|
||||||
let did_vgrindefs_syntax_inits = 1
|
|
||||||
command -nargs=+ HiLink hi link <args>
|
|
||||||
else
|
|
||||||
command -nargs=+ HiLink hi def link <args>
|
|
||||||
endif
|
|
||||||
|
|
||||||
" The default methods for highlighting. Can be overridden later
|
|
||||||
HiLink vgrindefsField Statement
|
|
||||||
HiLink vgrindefsComment Comment
|
|
||||||
|
|
||||||
delcommand HiLink
|
|
||||||
endif
|
|
||||||
|
|
||||||
let b:current_syntax = "vgrindefs"
|
let b:current_syntax = "vgrindefs"
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Vim .viminfo file
|
" Language: Vim .viminfo file
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
" Last Change: 2001 Apr 25
|
" Last Change: 2005 Jun 20
|
||||||
|
|
||||||
" For version 5.x: Clear all syntax items
|
" Quit when a (custom) syntax file was already loaded
|
||||||
" For version 6.x: Quit when a syntax file was already loaded
|
if exists("b:current_syntax")
|
||||||
if version < 600
|
|
||||||
syntax clear
|
|
||||||
elseif exists("b:current_syntax")
|
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -31,22 +28,10 @@ syn match viminfoOptionName "\*\a*"ms=s+1 contained
|
|||||||
syn match viminfoComment "^#.*"
|
syn match viminfoComment "^#.*"
|
||||||
|
|
||||||
" Define the default highlighting.
|
" Define the default highlighting.
|
||||||
" For version 5.7 and earlier: only when not done already
|
" Only used when an item doesn't have highlighting yet
|
||||||
" For version 5.8 and later: only when an item doesn't have highlighting yet
|
hi def link viminfoComment Comment
|
||||||
if version >= 508 || !exists("did_viminfo_syntax_inits")
|
hi def link viminfoError Error
|
||||||
if version < 508
|
hi def link viminfoStatement Statement
|
||||||
let did_viminfo_syntax_inits = 1
|
|
||||||
command -nargs=+ HiLink hi link <args>
|
|
||||||
else
|
|
||||||
command -nargs=+ HiLink hi def link <args>
|
|
||||||
endif
|
|
||||||
|
|
||||||
HiLink viminfoComment Comment
|
|
||||||
HiLink viminfoError Error
|
|
||||||
HiLink viminfoStatement Statement
|
|
||||||
|
|
||||||
delcommand HiLink
|
|
||||||
endif
|
|
||||||
|
|
||||||
let b:current_syntax = "viminfo"
|
let b:current_syntax = "viminfo"
|
||||||
|
|
||||||
|
|||||||
115
src/eval.c
115
src/eval.c
@@ -540,6 +540,8 @@ static void f_setreg __ARGS((typval_T *argvars, typval_T *rettv));
|
|||||||
static void f_setwinvar __ARGS((typval_T *argvars, typval_T *rettv));
|
static void f_setwinvar __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
static void f_simplify __ARGS((typval_T *argvars, typval_T *rettv));
|
static void f_simplify __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
static void f_sort __ARGS((typval_T *argvars, typval_T *rettv));
|
static void f_sort __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
|
static void f_spellbadword __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
|
static void f_spellsuggest __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
static void f_split __ARGS((typval_T *argvars, typval_T *rettv));
|
static void f_split __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
#ifdef HAVE_STRFTIME
|
#ifdef HAVE_STRFTIME
|
||||||
static void f_strftime __ARGS((typval_T *argvars, typval_T *rettv));
|
static void f_strftime __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
@@ -6351,6 +6353,8 @@ static struct fst
|
|||||||
{"setwinvar", 3, 3, f_setwinvar},
|
{"setwinvar", 3, 3, f_setwinvar},
|
||||||
{"simplify", 1, 1, f_simplify},
|
{"simplify", 1, 1, f_simplify},
|
||||||
{"sort", 1, 2, f_sort},
|
{"sort", 1, 2, f_sort},
|
||||||
|
{"spellbadword", 0, 0, f_spellbadword},
|
||||||
|
{"spellsuggest", 1, 2, f_spellsuggest},
|
||||||
{"split", 1, 3, f_split},
|
{"split", 1, 3, f_split},
|
||||||
#ifdef HAVE_STRFTIME
|
#ifdef HAVE_STRFTIME
|
||||||
{"strftime", 1, 2, f_strftime},
|
{"strftime", 1, 2, f_strftime},
|
||||||
@@ -13071,6 +13075,91 @@ f_sort(argvars, rettv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* "spellbadword()" function
|
||||||
|
*/
|
||||||
|
/* ARGSUSED */
|
||||||
|
static void
|
||||||
|
f_spellbadword(argvars, rettv)
|
||||||
|
typval_T *argvars;
|
||||||
|
typval_T *rettv;
|
||||||
|
{
|
||||||
|
int attr;
|
||||||
|
char_u *ptr;
|
||||||
|
int len;
|
||||||
|
|
||||||
|
rettv->vval.v_string = NULL;
|
||||||
|
rettv->v_type = VAR_STRING;
|
||||||
|
|
||||||
|
#ifdef FEAT_SYN_HL
|
||||||
|
/* Find the start of the badly spelled word. */
|
||||||
|
if (spell_move_to(FORWARD, TRUE, TRUE) == FAIL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* Get the length of the word and copy it. */
|
||||||
|
ptr = ml_get_cursor();
|
||||||
|
len = spell_check(curwin, ptr, &attr);
|
||||||
|
rettv->vval.v_string = vim_strnsave(ptr, len);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* "spellsuggest()" function
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
f_spellsuggest(argvars, rettv)
|
||||||
|
typval_T *argvars;
|
||||||
|
typval_T *rettv;
|
||||||
|
{
|
||||||
|
char_u *str;
|
||||||
|
int maxcount;
|
||||||
|
garray_T ga;
|
||||||
|
list_T *l;
|
||||||
|
listitem_T *li;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
l = list_alloc();
|
||||||
|
if (l == NULL)
|
||||||
|
return;
|
||||||
|
rettv->v_type = VAR_LIST;
|
||||||
|
rettv->vval.v_list = l;
|
||||||
|
++l->lv_refcount;
|
||||||
|
|
||||||
|
#ifdef FEAT_SYN_HL
|
||||||
|
if (curwin->w_p_spell && *curbuf->b_p_spl != NUL)
|
||||||
|
{
|
||||||
|
str = get_tv_string(&argvars[0]);
|
||||||
|
if (argvars[1].v_type != VAR_UNKNOWN)
|
||||||
|
{
|
||||||
|
maxcount = get_tv_number(&argvars[1]);
|
||||||
|
if (maxcount <= 0)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
maxcount = 25;
|
||||||
|
|
||||||
|
spell_suggest_list(&ga, str, maxcount);
|
||||||
|
|
||||||
|
for (i = 0; i < ga.ga_len; ++i)
|
||||||
|
{
|
||||||
|
str = ((char_u **)ga.ga_data)[i];
|
||||||
|
|
||||||
|
li = listitem_alloc();
|
||||||
|
if (li == NULL)
|
||||||
|
vim_free(str);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
li->li_tv.v_type = VAR_STRING;
|
||||||
|
li->li_tv.v_lock = 0;
|
||||||
|
li->li_tv.vval.v_string = str;
|
||||||
|
list_append(l, li);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ga_clear(&ga);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
f_split(argvars, rettv)
|
f_split(argvars, rettv)
|
||||||
typval_T *argvars;
|
typval_T *argvars;
|
||||||
@@ -16002,7 +16091,7 @@ ex_function(eap)
|
|||||||
* "name" == NULL, "fudi.fd_dict" set,
|
* "name" == NULL, "fudi.fd_dict" set,
|
||||||
* "fudi.fd_di" == NULL, "fudi.fd_newkey" == func
|
* "fudi.fd_di" == NULL, "fudi.fd_newkey" == func
|
||||||
* dict.func existing dict entry with a Funcref
|
* dict.func existing dict entry with a Funcref
|
||||||
* "name" == fname, "fudi.fd_dict" set,
|
* "name" == func, "fudi.fd_dict" set,
|
||||||
* "fudi.fd_di" set, "fudi.fd_newkey" == NULL
|
* "fudi.fd_di" set, "fudi.fd_newkey" == NULL
|
||||||
* dict.func existing dict entry that's not a Funcref
|
* dict.func existing dict entry that's not a Funcref
|
||||||
* "name" == NULL, "fudi.fd_dict" set,
|
* "name" == NULL, "fudi.fd_dict" set,
|
||||||
@@ -16096,6 +16185,27 @@ ex_function(eap)
|
|||||||
ga_init2(&newargs, (int)sizeof(char_u *), 3);
|
ga_init2(&newargs, (int)sizeof(char_u *), 3);
|
||||||
ga_init2(&newlines, (int)sizeof(char_u *), 3);
|
ga_init2(&newlines, (int)sizeof(char_u *), 3);
|
||||||
|
|
||||||
|
if (!eap->skip)
|
||||||
|
{
|
||||||
|
/* Check the name of the function. */
|
||||||
|
if (name != NULL)
|
||||||
|
arg = name;
|
||||||
|
else
|
||||||
|
arg = fudi.fd_newkey;
|
||||||
|
if (arg != NULL)
|
||||||
|
{
|
||||||
|
if (*arg == K_SPECIAL)
|
||||||
|
j = 3;
|
||||||
|
else
|
||||||
|
j = 0;
|
||||||
|
while (arg[j] != NUL && (j == 0 ? eval_isnamec1(arg[j])
|
||||||
|
: eval_isnamec(arg[j])))
|
||||||
|
++j;
|
||||||
|
if (arg[j] != NUL)
|
||||||
|
emsg_funcname(_(e_invarg2), arg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Isolate the arguments: "arg1, arg2, ...)"
|
* Isolate the arguments: "arg1, arg2, ...)"
|
||||||
*/
|
*/
|
||||||
@@ -16187,6 +16297,9 @@ ex_function(eap)
|
|||||||
emsg_funcname(e_funcexts, name);
|
emsg_funcname(e_funcexts, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!eap->skip && did_emsg)
|
||||||
|
goto erret;
|
||||||
|
|
||||||
msg_putchar('\n'); /* don't overwrite the function name */
|
msg_putchar('\n'); /* don't overwrite the function name */
|
||||||
cmdline_row = msg_row;
|
cmdline_row = msg_row;
|
||||||
}
|
}
|
||||||
|
|||||||
151
src/ex_docmd.c
151
src/ex_docmd.c
@@ -135,6 +135,9 @@ static void ex_script_ni __ARGS((exarg_T *eap));
|
|||||||
#endif
|
#endif
|
||||||
static char_u *invalid_range __ARGS((exarg_T *eap));
|
static char_u *invalid_range __ARGS((exarg_T *eap));
|
||||||
static void correct_range __ARGS((exarg_T *eap));
|
static void correct_range __ARGS((exarg_T *eap));
|
||||||
|
#ifdef FEAT_QUICKFIX
|
||||||
|
static char_u *replace_makeprg __ARGS((exarg_T *eap, char_u *p, char_u **cmdlinep));
|
||||||
|
#endif
|
||||||
static char_u *repl_cmdline __ARGS((exarg_T *eap, char_u *src, int srclen, char_u *repl, char_u **cmdlinep));
|
static char_u *repl_cmdline __ARGS((exarg_T *eap, char_u *src, int srclen, char_u *repl, char_u **cmdlinep));
|
||||||
static void ex_highlight __ARGS((exarg_T *eap));
|
static void ex_highlight __ARGS((exarg_T *eap));
|
||||||
static void ex_colorscheme __ARGS((exarg_T *eap));
|
static void ex_colorscheme __ARGS((exarg_T *eap));
|
||||||
@@ -2187,71 +2190,10 @@ do_one_cmd(cmdlinep, sourcing,
|
|||||||
/*
|
/*
|
||||||
* For the ":make" and ":grep" commands we insert the 'makeprg'/'grepprg'
|
* For the ":make" and ":grep" commands we insert the 'makeprg'/'grepprg'
|
||||||
* option here, so things like % get expanded.
|
* option here, so things like % get expanded.
|
||||||
* Don't do it when ":vimgrep" is used for ":grep".
|
|
||||||
*/
|
*/
|
||||||
if ((ea.cmdidx == CMD_make
|
p = replace_makeprg(&ea, p, cmdlinep);
|
||||||
|| ea.cmdidx == CMD_grep || ea.cmdidx == CMD_grepadd)
|
if (p == NULL)
|
||||||
&& !grep_internal(ea.cmdidx))
|
goto doend;
|
||||||
{
|
|
||||||
char_u *new_cmdline;
|
|
||||||
char_u *program;
|
|
||||||
char_u *pos;
|
|
||||||
char_u *ptr;
|
|
||||||
int len;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (ea.cmdidx == CMD_grep || ea.cmdidx == CMD_grepadd)
|
|
||||||
{
|
|
||||||
if (*curbuf->b_p_gp == NUL)
|
|
||||||
program = p_gp;
|
|
||||||
else
|
|
||||||
program = curbuf->b_p_gp;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (*curbuf->b_p_mp == NUL)
|
|
||||||
program = p_mp;
|
|
||||||
else
|
|
||||||
program = curbuf->b_p_mp;
|
|
||||||
}
|
|
||||||
|
|
||||||
p = skipwhite(p);
|
|
||||||
|
|
||||||
if ((pos = (char_u *)strstr((char *)program, "$*")) != NULL)
|
|
||||||
{ /* replace $* by given arguments */
|
|
||||||
i = 1;
|
|
||||||
while ((pos = (char_u *)strstr((char *)pos + 2, "$*")) != NULL)
|
|
||||||
++i;
|
|
||||||
len = (int)STRLEN(p);
|
|
||||||
new_cmdline = alloc((int)(STRLEN(program) + i * (len - 2) + 1));
|
|
||||||
if (new_cmdline == NULL)
|
|
||||||
goto doend; /* out of memory */
|
|
||||||
ptr = new_cmdline;
|
|
||||||
while ((pos = (char_u *)strstr((char *)program, "$*")) != NULL)
|
|
||||||
{
|
|
||||||
i = (int)(pos - program);
|
|
||||||
STRNCPY(ptr, program, i);
|
|
||||||
STRCPY(ptr += i, p);
|
|
||||||
ptr += len;
|
|
||||||
program = pos + 2;
|
|
||||||
}
|
|
||||||
STRCPY(ptr, program);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
new_cmdline = alloc((int)(STRLEN(program) + STRLEN(p) + 2));
|
|
||||||
if (new_cmdline == NULL)
|
|
||||||
goto doend; /* out of memory */
|
|
||||||
STRCPY(new_cmdline, program);
|
|
||||||
STRCAT(new_cmdline, " ");
|
|
||||||
STRCAT(new_cmdline, p);
|
|
||||||
}
|
|
||||||
msg_make(p);
|
|
||||||
/* 'ea.cmd' is not set here, because it is not used at CMD_make */
|
|
||||||
vim_free(*cmdlinep);
|
|
||||||
*cmdlinep = new_cmdline;
|
|
||||||
p = new_cmdline;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -4031,6 +3973,87 @@ skip_grep_pat(eap)
|
|||||||
}
|
}
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For the ":make" and ":grep" commands insert the 'makeprg'/'grepprg' option
|
||||||
|
* in the command line, so that things like % get expanded.
|
||||||
|
*/
|
||||||
|
static char_u *
|
||||||
|
replace_makeprg(eap, p, cmdlinep)
|
||||||
|
exarg_T *eap;
|
||||||
|
char_u *p;
|
||||||
|
char_u **cmdlinep;
|
||||||
|
{
|
||||||
|
char_u *new_cmdline;
|
||||||
|
char_u *program;
|
||||||
|
char_u *pos;
|
||||||
|
char_u *ptr;
|
||||||
|
int len;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Don't do it when ":vimgrep" is used for ":grep".
|
||||||
|
*/
|
||||||
|
if ((eap->cmdidx == CMD_make
|
||||||
|
|| eap->cmdidx == CMD_grep || eap->cmdidx == CMD_grepadd)
|
||||||
|
&& !grep_internal(eap->cmdidx))
|
||||||
|
{
|
||||||
|
if (eap->cmdidx == CMD_grep || eap->cmdidx == CMD_grepadd)
|
||||||
|
{
|
||||||
|
if (*curbuf->b_p_gp == NUL)
|
||||||
|
program = p_gp;
|
||||||
|
else
|
||||||
|
program = curbuf->b_p_gp;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (*curbuf->b_p_mp == NUL)
|
||||||
|
program = p_mp;
|
||||||
|
else
|
||||||
|
program = curbuf->b_p_mp;
|
||||||
|
}
|
||||||
|
|
||||||
|
p = skipwhite(p);
|
||||||
|
|
||||||
|
if ((pos = (char_u *)strstr((char *)program, "$*")) != NULL)
|
||||||
|
{
|
||||||
|
/* replace $* by given arguments */
|
||||||
|
i = 1;
|
||||||
|
while ((pos = (char_u *)strstr((char *)pos + 2, "$*")) != NULL)
|
||||||
|
++i;
|
||||||
|
len = (int)STRLEN(p);
|
||||||
|
new_cmdline = alloc((int)(STRLEN(program) + i * (len - 2) + 1));
|
||||||
|
if (new_cmdline == NULL)
|
||||||
|
return NULL; /* out of memory */
|
||||||
|
ptr = new_cmdline;
|
||||||
|
while ((pos = (char_u *)strstr((char *)program, "$*")) != NULL)
|
||||||
|
{
|
||||||
|
i = (int)(pos - program);
|
||||||
|
STRNCPY(ptr, program, i);
|
||||||
|
STRCPY(ptr += i, p);
|
||||||
|
ptr += len;
|
||||||
|
program = pos + 2;
|
||||||
|
}
|
||||||
|
STRCPY(ptr, program);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
new_cmdline = alloc((int)(STRLEN(program) + STRLEN(p) + 2));
|
||||||
|
if (new_cmdline == NULL)
|
||||||
|
return NULL; /* out of memory */
|
||||||
|
STRCPY(new_cmdline, program);
|
||||||
|
STRCAT(new_cmdline, " ");
|
||||||
|
STRCAT(new_cmdline, p);
|
||||||
|
}
|
||||||
|
msg_make(p);
|
||||||
|
|
||||||
|
/* 'eap->cmd' is not set here, because it is not used at CMD_make */
|
||||||
|
vim_free(*cmdlinep);
|
||||||
|
*cmdlinep = new_cmdline;
|
||||||
|
p = new_cmdline;
|
||||||
|
}
|
||||||
|
return p;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -3183,7 +3183,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
|
|||||||
struct stat st_new;
|
struct stat st_new;
|
||||||
char_u *dirp;
|
char_u *dirp;
|
||||||
char_u *rootname;
|
char_u *rootname;
|
||||||
#ifndef SHORT_FNAME
|
#if defined(UNIX) && !defined(SHORT_FNAME)
|
||||||
int did_set_shortname;
|
int did_set_shortname;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -3226,7 +3226,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
|
|||||||
goto nobackup;
|
goto nobackup;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef SHORT_FNAME
|
#if defined(UNIX) && !defined(SHORT_FNAME)
|
||||||
did_set_shortname = FALSE;
|
did_set_shortname = FALSE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -14,15 +14,15 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
void global_ime_init(ATOM, HWND);
|
void global_ime_init(ATOM, HWND);
|
||||||
void global_ime_end();
|
void global_ime_end(void);
|
||||||
LRESULT WINAPI global_ime_DefWindowProc(HWND, UINT, WPARAM, LPARAM);
|
LRESULT WINAPI global_ime_DefWindowProc(HWND, UINT, WPARAM, LPARAM);
|
||||||
BOOL WINAPI global_ime_TranslateMessage(CONST MSG *);
|
BOOL WINAPI global_ime_TranslateMessage(CONST MSG *);
|
||||||
void WINAPI global_ime_set_position(POINT*);
|
void WINAPI global_ime_set_position(POINT*);
|
||||||
void WINAPI global_ime_set_font(LOGFONT*);
|
void WINAPI global_ime_set_font(LOGFONT*);
|
||||||
void WINAPI global_ime_status_evacuate();
|
void WINAPI global_ime_status_evacuate(void);
|
||||||
void WINAPI global_ime_status_restore();
|
void WINAPI global_ime_status_restore(void);
|
||||||
void WINAPI global_ime_set_status(int status);
|
void WINAPI global_ime_set_status(int status);
|
||||||
int WINAPI global_ime_get_status();
|
int WINAPI global_ime_get_status(void);
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|||||||
@@ -85,8 +85,6 @@ EXTERN int cmdline_star INIT(= FALSE); /* cmdline is crypted */
|
|||||||
#endif
|
#endif
|
||||||
EXTERN int exec_from_reg INIT(= FALSE); /* executing register */
|
EXTERN int exec_from_reg INIT(= FALSE); /* executing register */
|
||||||
|
|
||||||
EXTERN int global_changedtick INIT(= 0); /* incremented for each
|
|
||||||
change, also for undo */
|
|
||||||
EXTERN int screen_cleared INIT(= FALSE); /* screen has been cleared */
|
EXTERN int screen_cleared INIT(= FALSE); /* screen has been cleared */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -961,10 +959,6 @@ EXTERN int keep_help_flag INIT(= FALSE); /* doing :ta from help file */
|
|||||||
*/
|
*/
|
||||||
EXTERN char_u *empty_option INIT(= (char_u *)"");
|
EXTERN char_u *empty_option INIT(= (char_u *)"");
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
EXTERN FILE *debugfp INIT(= NULL);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EXTERN int redir_off INIT(= FALSE); /* no redirection for a moment */
|
EXTERN int redir_off INIT(= FALSE); /* no redirection for a moment */
|
||||||
EXTERN FILE *redir_fd INIT(= NULL); /* message redirection file */
|
EXTERN FILE *redir_fd INIT(= NULL); /* message redirection file */
|
||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
|
|||||||
@@ -172,6 +172,9 @@ typedef int GtkWidget;
|
|||||||
static void entry_activate_cb(GtkWidget *widget, gpointer data);
|
static void entry_activate_cb(GtkWidget *widget, gpointer data);
|
||||||
static void entry_changed_cb(GtkWidget *entry, GtkWidget *dialog);
|
static void entry_changed_cb(GtkWidget *entry, GtkWidget *dialog);
|
||||||
static void find_replace_cb(GtkWidget *widget, gpointer data);
|
static void find_replace_cb(GtkWidget *widget, gpointer data);
|
||||||
|
#ifndef HAVE_GTK2
|
||||||
|
static void gui_gtk_position_in_parent(GtkWidget *parent, GtkWidget *child, gui_win_pos_T where);
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(FEAT_TOOLBAR) && defined(HAVE_GTK2)
|
#if defined(FEAT_TOOLBAR) && defined(HAVE_GTK2)
|
||||||
/*
|
/*
|
||||||
@@ -3093,7 +3096,7 @@ ex_helpfind(eap)
|
|||||||
*
|
*
|
||||||
* brent -- dbv
|
* brent -- dbv
|
||||||
*/
|
*/
|
||||||
void
|
static void
|
||||||
gui_gtk_position_in_parent(
|
gui_gtk_position_in_parent(
|
||||||
GtkWidget *parent,
|
GtkWidget *parent,
|
||||||
GtkWidget *child,
|
GtkWidget *child,
|
||||||
|
|||||||
@@ -258,18 +258,18 @@ typedef struct tagCOMPOSITIONFORM {
|
|||||||
typedef HANDLE HIMC;
|
typedef HANDLE HIMC;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
HINSTANCE hLibImm = NULL;
|
static HINSTANCE hLibImm = NULL;
|
||||||
LONG (WINAPI *pImmGetCompositionStringA)(HIMC, DWORD, LPVOID, DWORD);
|
static LONG (WINAPI *pImmGetCompositionStringA)(HIMC, DWORD, LPVOID, DWORD);
|
||||||
LONG (WINAPI *pImmGetCompositionStringW)(HIMC, DWORD, LPVOID, DWORD);
|
static LONG (WINAPI *pImmGetCompositionStringW)(HIMC, DWORD, LPVOID, DWORD);
|
||||||
HIMC (WINAPI *pImmGetContext)(HWND);
|
static HIMC (WINAPI *pImmGetContext)(HWND);
|
||||||
HIMC (WINAPI *pImmAssociateContext)(HWND, HIMC);
|
static HIMC (WINAPI *pImmAssociateContext)(HWND, HIMC);
|
||||||
BOOL (WINAPI *pImmReleaseContext)(HWND, HIMC);
|
static BOOL (WINAPI *pImmReleaseContext)(HWND, HIMC);
|
||||||
BOOL (WINAPI *pImmGetOpenStatus)(HIMC);
|
static BOOL (WINAPI *pImmGetOpenStatus)(HIMC);
|
||||||
BOOL (WINAPI *pImmSetOpenStatus)(HIMC, BOOL);
|
static BOOL (WINAPI *pImmSetOpenStatus)(HIMC, BOOL);
|
||||||
BOOL (WINAPI *pImmGetCompositionFont)(HIMC, LPLOGFONTA);
|
static BOOL (WINAPI *pImmGetCompositionFont)(HIMC, LPLOGFONTA);
|
||||||
BOOL (WINAPI *pImmSetCompositionFont)(HIMC, LPLOGFONTA);
|
static BOOL (WINAPI *pImmSetCompositionFont)(HIMC, LPLOGFONTA);
|
||||||
BOOL (WINAPI *pImmSetCompositionWindow)(HIMC, LPCOMPOSITIONFORM);
|
static BOOL (WINAPI *pImmSetCompositionWindow)(HIMC, LPCOMPOSITIONFORM);
|
||||||
BOOL (WINAPI *pImmGetConversionStatus)(HIMC, LPDWORD, LPDWORD);
|
static BOOL (WINAPI *pImmGetConversionStatus)(HIMC, LPDWORD, LPDWORD);
|
||||||
static void dyn_imm_load(void);
|
static void dyn_imm_load(void);
|
||||||
#else
|
#else
|
||||||
# define pImmGetCompositionStringA ImmGetCompositionStringA
|
# define pImmGetCompositionStringA ImmGetCompositionStringA
|
||||||
@@ -1443,6 +1443,7 @@ gui_mch_set_sp_color(guicolor_T color)
|
|||||||
/*
|
/*
|
||||||
* handle WM_IME_NOTIFY message
|
* handle WM_IME_NOTIFY message
|
||||||
*/
|
*/
|
||||||
|
/*ARGSUSED*/
|
||||||
static LRESULT
|
static LRESULT
|
||||||
_OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData)
|
_OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData)
|
||||||
{
|
{
|
||||||
@@ -1492,6 +1493,7 @@ _OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData)
|
|||||||
return lResult;
|
return lResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*ARGSUSED*/
|
||||||
static LRESULT
|
static LRESULT
|
||||||
_OnImeComposition(HWND hwnd, WPARAM dbcs, LPARAM param)
|
_OnImeComposition(HWND hwnd, WPARAM dbcs, LPARAM param)
|
||||||
{
|
{
|
||||||
@@ -4147,6 +4149,7 @@ gui_mch_post_balloon(beval, mesg)
|
|||||||
// TRACE0("gui_mch_post_balloon }}}");
|
// TRACE0("gui_mch_post_balloon }}}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*ARGSUSED*/
|
||||||
BalloonEval *
|
BalloonEval *
|
||||||
gui_mch_create_beval_area(target, mesg, mesgCB, clientData)
|
gui_mch_create_beval_area(target, mesg, mesgCB, clientData)
|
||||||
void *target; /* ignored, always use s_textArea */
|
void *target; /* ignored, always use s_textArea */
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ static void (*dll_scheme_dont_gc_ptr)(void *p);
|
|||||||
static Scheme_Object *(*dll_scheme_eval)(Scheme_Object *obj, Scheme_Env *env);
|
static Scheme_Object *(*dll_scheme_eval)(Scheme_Object *obj, Scheme_Env *env);
|
||||||
static Scheme_Object *(*dll_scheme_eval_string)(const char *str,
|
static Scheme_Object *(*dll_scheme_eval_string)(const char *str,
|
||||||
Scheme_Env *env);
|
Scheme_Env *env);
|
||||||
static Scheme_Object *(*dll_scheme_eval_string_all)(const char *str,
|
static Scheme_Object *(*dll_scheme_eval_string_all)(const char *str,
|
||||||
Scheme_Env *env, int all);
|
Scheme_Env *env, int all);
|
||||||
static void (*dll_scheme_finish_primitive_module)(Scheme_Env *env);
|
static void (*dll_scheme_finish_primitive_module)(Scheme_Env *env);
|
||||||
# if MZSCHEME_VERSION_MAJOR < 299
|
# if MZSCHEME_VERSION_MAJOR < 299
|
||||||
@@ -253,7 +253,7 @@ static Scheme_Object *(*dll_scheme_make_closed_prim_w_arity)
|
|||||||
static Scheme_Object *(*dll_scheme_make_integer_value)(long i);
|
static Scheme_Object *(*dll_scheme_make_integer_value)(long i);
|
||||||
static Scheme_Object *(*dll_scheme_make_namespace)(int argc,
|
static Scheme_Object *(*dll_scheme_make_namespace)(int argc,
|
||||||
Scheme_Object *argv[]);
|
Scheme_Object *argv[]);
|
||||||
static Scheme_Object *(*dll_scheme_make_pair)(Scheme_Object *car,
|
static Scheme_Object *(*dll_scheme_make_pair)(Scheme_Object *car,
|
||||||
Scheme_Object *cdr);
|
Scheme_Object *cdr);
|
||||||
static Scheme_Object *(*dll_scheme_make_prim_w_arity)(Scheme_Prim *prim,
|
static Scheme_Object *(*dll_scheme_make_prim_w_arity)(Scheme_Prim *prim,
|
||||||
const char *name, mzshort mina, mzshort maxa);
|
const char *name, mzshort mina, mzshort maxa);
|
||||||
@@ -294,7 +294,7 @@ static void (*dll_scheme_signal_error)(const char *msg, ...);
|
|||||||
static void (*dll_scheme_wrong_type)(const char *name, const char *expected,
|
static void (*dll_scheme_wrong_type)(const char *name, const char *expected,
|
||||||
int which, int argc, Scheme_Object **argv);
|
int which, int argc, Scheme_Object **argv);
|
||||||
# if MZSCHEME_VERSION_MAJOR >= 299
|
# if MZSCHEME_VERSION_MAJOR >= 299
|
||||||
static void (*dll_scheme_set_param)(Scheme_Config *c, int pos,
|
static void (*dll_scheme_set_param)(Scheme_Config *c, int pos,
|
||||||
Scheme_Object *o);
|
Scheme_Object *o);
|
||||||
static Scheme_Config *(*dll_scheme_current_config)(void);
|
static Scheme_Config *(*dll_scheme_current_config)(void);
|
||||||
static Scheme_Object *(*dll_scheme_char_string_to_byte_string)
|
static Scheme_Object *(*dll_scheme_char_string_to_byte_string)
|
||||||
@@ -411,7 +411,7 @@ static Thunk_Info mzsch_imports[] = {
|
|||||||
{"scheme_current_thread", (void **)&dll_scheme_current_thread_ptr},
|
{"scheme_current_thread", (void **)&dll_scheme_current_thread_ptr},
|
||||||
{"scheme_console_printf", (void **)&dll_scheme_console_printf_ptr},
|
{"scheme_console_printf", (void **)&dll_scheme_console_printf_ptr},
|
||||||
{"scheme_console_output", (void **)&dll_scheme_console_output_ptr},
|
{"scheme_console_output", (void **)&dll_scheme_console_output_ptr},
|
||||||
{"scheme_notify_multithread",
|
{"scheme_notify_multithread",
|
||||||
(void **)&dll_scheme_notify_multithread_ptr},
|
(void **)&dll_scheme_notify_multithread_ptr},
|
||||||
{"scheme_add_global", (void **)&dll_scheme_add_global},
|
{"scheme_add_global", (void **)&dll_scheme_add_global},
|
||||||
{"scheme_add_global_symbol", (void **)&dll_scheme_add_global_symbol},
|
{"scheme_add_global_symbol", (void **)&dll_scheme_add_global_symbol},
|
||||||
@@ -424,7 +424,7 @@ static Thunk_Info mzsch_imports[] = {
|
|||||||
{"scheme_check_threads", (void **)&dll_scheme_check_threads},
|
{"scheme_check_threads", (void **)&dll_scheme_check_threads},
|
||||||
{"scheme_close_input_port", (void **)&dll_scheme_close_input_port},
|
{"scheme_close_input_port", (void **)&dll_scheme_close_input_port},
|
||||||
{"scheme_count_lines", (void **)&dll_scheme_count_lines},
|
{"scheme_count_lines", (void **)&dll_scheme_count_lines},
|
||||||
{"scheme_current_continuation_marks",
|
{"scheme_current_continuation_marks",
|
||||||
(void **)&dll_scheme_current_continuation_marks},
|
(void **)&dll_scheme_current_continuation_marks},
|
||||||
{"scheme_display", (void **)&dll_scheme_display},
|
{"scheme_display", (void **)&dll_scheme_display},
|
||||||
{"scheme_display_to_string", (void **)&dll_scheme_display_to_string},
|
{"scheme_display_to_string", (void **)&dll_scheme_display_to_string},
|
||||||
@@ -434,7 +434,7 @@ static Thunk_Info mzsch_imports[] = {
|
|||||||
{"scheme_eval", (void **)&dll_scheme_eval},
|
{"scheme_eval", (void **)&dll_scheme_eval},
|
||||||
{"scheme_eval_string", (void **)&dll_scheme_eval_string},
|
{"scheme_eval_string", (void **)&dll_scheme_eval_string},
|
||||||
{"scheme_eval_string_all", (void **)&dll_scheme_eval_string_all},
|
{"scheme_eval_string_all", (void **)&dll_scheme_eval_string_all},
|
||||||
{"scheme_finish_primitive_module",
|
{"scheme_finish_primitive_module",
|
||||||
(void **)&dll_scheme_finish_primitive_module},
|
(void **)&dll_scheme_finish_primitive_module},
|
||||||
# if MZSCHEME_VERSION_MAJOR < 299
|
# if MZSCHEME_VERSION_MAJOR < 299
|
||||||
{"scheme_format", (void **)&dll_scheme_format},
|
{"scheme_format", (void **)&dll_scheme_format},
|
||||||
@@ -444,15 +444,15 @@ static Thunk_Info mzsch_imports[] = {
|
|||||||
#endif
|
#endif
|
||||||
{"scheme_gc_ptr_ok", (void **)&dll_scheme_gc_ptr_ok},
|
{"scheme_gc_ptr_ok", (void **)&dll_scheme_gc_ptr_ok},
|
||||||
# if MZSCHEME_VERSION_MAJOR < 299
|
# if MZSCHEME_VERSION_MAJOR < 299
|
||||||
{"scheme_get_sized_string_output",
|
{"scheme_get_sized_string_output",
|
||||||
(void **)&dll_scheme_get_sized_string_output},
|
(void **)&dll_scheme_get_sized_string_output},
|
||||||
# else
|
# else
|
||||||
{"scheme_get_sized_byte_string_output",
|
{"scheme_get_sized_byte_string_output",
|
||||||
(void **)&dll_scheme_get_sized_byte_string_output},
|
(void **)&dll_scheme_get_sized_byte_string_output},
|
||||||
#endif
|
#endif
|
||||||
{"scheme_intern_symbol", (void **)&dll_scheme_intern_symbol},
|
{"scheme_intern_symbol", (void **)&dll_scheme_intern_symbol},
|
||||||
{"scheme_lookup_global", (void **)&dll_scheme_lookup_global},
|
{"scheme_lookup_global", (void **)&dll_scheme_lookup_global},
|
||||||
{"scheme_make_closed_prim_w_arity",
|
{"scheme_make_closed_prim_w_arity",
|
||||||
(void **)&dll_scheme_make_closed_prim_w_arity},
|
(void **)&dll_scheme_make_closed_prim_w_arity},
|
||||||
{"scheme_make_integer_value", (void **)&dll_scheme_make_integer_value},
|
{"scheme_make_integer_value", (void **)&dll_scheme_make_integer_value},
|
||||||
{"scheme_make_namespace", (void **)&dll_scheme_make_namespace},
|
{"scheme_make_namespace", (void **)&dll_scheme_make_namespace},
|
||||||
@@ -460,14 +460,14 @@ static Thunk_Info mzsch_imports[] = {
|
|||||||
{"scheme_make_prim_w_arity", (void **)&dll_scheme_make_prim_w_arity},
|
{"scheme_make_prim_w_arity", (void **)&dll_scheme_make_prim_w_arity},
|
||||||
# if MZSCHEME_VERSION_MAJOR < 299
|
# if MZSCHEME_VERSION_MAJOR < 299
|
||||||
{"scheme_make_string", (void **)&dll_scheme_make_string},
|
{"scheme_make_string", (void **)&dll_scheme_make_string},
|
||||||
{"scheme_make_string_output_port",
|
{"scheme_make_string_output_port",
|
||||||
(void **)&dll_scheme_make_string_output_port},
|
(void **)&dll_scheme_make_string_output_port},
|
||||||
# else
|
# else
|
||||||
{"scheme_make_byte_string", (void **)&dll_scheme_make_byte_string},
|
{"scheme_make_byte_string", (void **)&dll_scheme_make_byte_string},
|
||||||
{"scheme_make_byte_string_output_port",
|
{"scheme_make_byte_string_output_port",
|
||||||
(void **)&dll_scheme_make_byte_string_output_port},
|
(void **)&dll_scheme_make_byte_string_output_port},
|
||||||
# endif
|
# endif
|
||||||
{"scheme_make_struct_instance",
|
{"scheme_make_struct_instance",
|
||||||
(void **)&dll_scheme_make_struct_instance},
|
(void **)&dll_scheme_make_struct_instance},
|
||||||
{"scheme_make_struct_names", (void **)&dll_scheme_make_struct_names},
|
{"scheme_make_struct_names", (void **)&dll_scheme_make_struct_names},
|
||||||
{"scheme_make_struct_type", (void **)&dll_scheme_make_struct_type},
|
{"scheme_make_struct_type", (void **)&dll_scheme_make_struct_type},
|
||||||
@@ -525,7 +525,7 @@ mzscheme_runtime_link_init(char *sch_dll, char *gc_dll, int verbose)
|
|||||||
|
|
||||||
for (thunk = mzsch_imports; thunk->name; thunk++)
|
for (thunk = mzsch_imports; thunk->name; thunk++)
|
||||||
{
|
{
|
||||||
if ((*thunk->ptr =
|
if ((*thunk->ptr =
|
||||||
(void *)GetProcAddress(hMzSch, thunk->name)) == NULL)
|
(void *)GetProcAddress(hMzSch, thunk->name)) == NULL)
|
||||||
{
|
{
|
||||||
FreeLibrary(hMzSch);
|
FreeLibrary(hMzSch);
|
||||||
@@ -539,7 +539,7 @@ mzscheme_runtime_link_init(char *sch_dll, char *gc_dll, int verbose)
|
|||||||
}
|
}
|
||||||
for (thunk = mzgc_imports; thunk->name; thunk++)
|
for (thunk = mzgc_imports; thunk->name; thunk++)
|
||||||
{
|
{
|
||||||
if ((*thunk->ptr =
|
if ((*thunk->ptr =
|
||||||
(void *)GetProcAddress(hMzGC, thunk->name)) == NULL)
|
(void *)GetProcAddress(hMzGC, thunk->name)) == NULL)
|
||||||
{
|
{
|
||||||
FreeLibrary(hMzSch);
|
FreeLibrary(hMzSch);
|
||||||
@@ -2655,7 +2655,7 @@ make_modules(Scheme_Env *env)
|
|||||||
scheme_add_global("global-namespace", (Scheme_Object *)environment, mod);
|
scheme_add_global("global-namespace", (Scheme_Object *)environment, mod);
|
||||||
scheme_finish_primitive_module(mod);
|
scheme_finish_primitive_module(mod);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_SANDBOX
|
#ifdef HAVE_SANDBOX
|
||||||
static Scheme_Object *M_write = NULL;
|
static Scheme_Object *M_write = NULL;
|
||||||
static Scheme_Object *M_read = NULL;
|
static Scheme_Object *M_read = NULL;
|
||||||
@@ -2669,7 +2669,7 @@ sandbox_check()
|
|||||||
raise_vim_exn(_("not allowed in the Vim sandbox"));
|
raise_vim_exn(_("not allowed in the Vim sandbox"));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* security guards to force Vim's sandbox restrictions on MzScheme level */
|
/* security guards to force Vim's sandbox restrictions on MzScheme level */
|
||||||
static Scheme_Object *
|
static Scheme_Object *
|
||||||
sandbox_file_guard(int argc, Scheme_Object **argv)
|
sandbox_file_guard(int argc, Scheme_Object **argv)
|
||||||
{
|
{
|
||||||
|
|||||||
10
src/mbyte.c
10
src/mbyte.c
@@ -3178,11 +3178,11 @@ iconv_enabled(verbose)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
*((FARPROC*)&iconv) = GetProcAddress(hIconvDLL, "libiconv");
|
iconv = (void *)GetProcAddress(hIconvDLL, "libiconv");
|
||||||
*((FARPROC*)&iconv_open) = GetProcAddress(hIconvDLL, "libiconv_open");
|
iconv_open = (void *)GetProcAddress(hIconvDLL, "libiconv_open");
|
||||||
*((FARPROC*)&iconv_close) = GetProcAddress(hIconvDLL, "libiconv_close");
|
iconv_close = (void *)GetProcAddress(hIconvDLL, "libiconv_close");
|
||||||
*((FARPROC*)&iconvctl) = GetProcAddress(hIconvDLL, "libiconvctl");
|
iconvctl = (void *)GetProcAddress(hIconvDLL, "libiconvctl");
|
||||||
*((FARPROC*)&iconv_errno) = GetProcAddress(hMsvcrtDLL, "_errno");
|
iconv_errno = (void *)GetProcAddress(hMsvcrtDLL, "_errno");
|
||||||
if (iconv == NULL || iconv_open == NULL || iconv_close == NULL
|
if (iconv == NULL || iconv_open == NULL || iconv_close == NULL
|
||||||
|| iconvctl == NULL || iconv_errno == NULL)
|
|| iconvctl == NULL || iconv_errno == NULL)
|
||||||
{
|
{
|
||||||
|
|||||||
15
src/misc1.c
15
src/misc1.c
@@ -2461,7 +2461,6 @@ changed()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
++curbuf->b_changedtick;
|
++curbuf->b_changedtick;
|
||||||
++global_changedtick;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void changedOneline __ARGS((buf_T *buf, linenr_T lnum));
|
static void changedOneline __ARGS((buf_T *buf, linenr_T lnum));
|
||||||
@@ -2851,7 +2850,6 @@ unchanged(buf, ff)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
++buf->b_changedtick;
|
++buf->b_changedtick;
|
||||||
++global_changedtick;
|
|
||||||
#ifdef FEAT_NETBEANS_INTG
|
#ifdef FEAT_NETBEANS_INTG
|
||||||
netbeans_unmodified(buf);
|
netbeans_unmodified(buf);
|
||||||
#endif
|
#endif
|
||||||
@@ -3144,9 +3142,18 @@ get_number(colon)
|
|||||||
prompt_for_number()
|
prompt_for_number()
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
int save_cmdline_row;
|
||||||
|
int save_State;
|
||||||
|
|
||||||
/* When using ":silent" assume that <CR> was entered. */
|
/* When using ":silent" assume that <CR> was entered. */
|
||||||
MSG_PUTS(_("Choice number (<Enter> cancels): "));
|
MSG_PUTS(_("Choice number (<Enter> cancels): "));
|
||||||
|
|
||||||
|
/* Set the state such that text can be selected/copied/pasted. */
|
||||||
|
save_cmdline_row = cmdline_row;
|
||||||
|
cmdline_row = Rows - 1;
|
||||||
|
save_State = State;
|
||||||
|
State = CMDLINE;
|
||||||
|
|
||||||
i = get_number(TRUE);
|
i = get_number(TRUE);
|
||||||
if (KeyTyped) /* don't call wait_return() now */
|
if (KeyTyped) /* don't call wait_return() now */
|
||||||
{
|
{
|
||||||
@@ -3155,6 +3162,10 @@ prompt_for_number()
|
|||||||
need_wait_return = FALSE;
|
need_wait_return = FALSE;
|
||||||
msg_didany = FALSE;
|
msg_didany = FALSE;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
cmdline_row = save_cmdline_row;
|
||||||
|
State = save_State;
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ netbeans_disconnect(void)
|
|||||||
#endif /* FEAT_GUI_GTK */
|
#endif /* FEAT_GUI_GTK */
|
||||||
|
|
||||||
#if defined(FEAT_GUI_W32) || defined(PROTO)
|
#if defined(FEAT_GUI_W32) || defined(PROTO)
|
||||||
void
|
static void
|
||||||
netbeans_w32_connect(void)
|
netbeans_w32_connect(void)
|
||||||
{
|
{
|
||||||
netbeans_connect();
|
netbeans_connect();
|
||||||
@@ -742,7 +742,7 @@ messageFromNetbeans(gpointer clientData, gint unused1,
|
|||||||
nbdebug(("messageFromNetbeans: Error in read() from socket\n"));
|
nbdebug(("messageFromNetbeans: Error in read() from socket\n"));
|
||||||
if (len < 0)
|
if (len < 0)
|
||||||
PERROR(_("read from Netbeans socket"));
|
PERROR(_("read from Netbeans socket"));
|
||||||
return; /* don't try to parse it */;
|
return; /* don't try to parse it */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Parse the messages, but avoid recursion. */
|
/* Parse the messages, but avoid recursion. */
|
||||||
@@ -863,8 +863,8 @@ struct nbbuf_struct
|
|||||||
typedef struct nbbuf_struct nbbuf_T;
|
typedef struct nbbuf_struct nbbuf_T;
|
||||||
|
|
||||||
static nbbuf_T *buf_list = 0;
|
static nbbuf_T *buf_list = 0;
|
||||||
int buf_list_size = 0; /* size of buf_list */
|
static int buf_list_size = 0; /* size of buf_list */
|
||||||
int buf_list_used = 0; /* nr of entries in buf_list actually in use */
|
static int buf_list_used = 0; /* nr of entries in buf_list actually in use */
|
||||||
|
|
||||||
static char **globalsignmap;
|
static char **globalsignmap;
|
||||||
static int globalsignmaplen;
|
static int globalsignmaplen;
|
||||||
|
|||||||
29
src/normal.c
29
src/normal.c
@@ -81,9 +81,6 @@ static void nv_ctrlo __ARGS((cmdarg_T *cap));
|
|||||||
static void nv_hat __ARGS((cmdarg_T *cap));
|
static void nv_hat __ARGS((cmdarg_T *cap));
|
||||||
static void nv_Zet __ARGS((cmdarg_T *cap));
|
static void nv_Zet __ARGS((cmdarg_T *cap));
|
||||||
static void nv_ident __ARGS((cmdarg_T *cap));
|
static void nv_ident __ARGS((cmdarg_T *cap));
|
||||||
#ifdef FEAT_VISUAL
|
|
||||||
static int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp));
|
|
||||||
#endif
|
|
||||||
static void nv_tagpop __ARGS((cmdarg_T *cap));
|
static void nv_tagpop __ARGS((cmdarg_T *cap));
|
||||||
static void nv_scroll __ARGS((cmdarg_T *cap));
|
static void nv_scroll __ARGS((cmdarg_T *cap));
|
||||||
static void nv_right __ARGS((cmdarg_T *cap));
|
static void nv_right __ARGS((cmdarg_T *cap));
|
||||||
@@ -5167,12 +5164,12 @@ nv_ident(cap)
|
|||||||
vim_free(buf);
|
vim_free(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef FEAT_VISUAL
|
#if defined(FEAT_VISUAL) || defined(PROTO)
|
||||||
/*
|
/*
|
||||||
* Get visually selected text, within one line only.
|
* Get visually selected text, within one line only.
|
||||||
* Returns FAIL if more than one line selected.
|
* Returns FAIL if more than one line selected.
|
||||||
*/
|
*/
|
||||||
static int
|
int
|
||||||
get_visual_text(cap, pp, lenp)
|
get_visual_text(cap, pp, lenp)
|
||||||
cmdarg_T *cap;
|
cmdarg_T *cap;
|
||||||
char_u **pp; /* return: start of selected text */
|
char_u **pp; /* return: start of selected text */
|
||||||
@@ -5182,7 +5179,8 @@ get_visual_text(cap, pp, lenp)
|
|||||||
unadjust_for_sel();
|
unadjust_for_sel();
|
||||||
if (VIsual.lnum != curwin->w_cursor.lnum)
|
if (VIsual.lnum != curwin->w_cursor.lnum)
|
||||||
{
|
{
|
||||||
clearopbeep(cap->oap);
|
if (cap != NULL)
|
||||||
|
clearopbeep(cap->oap);
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
if (VIsual_mode == 'V')
|
if (VIsual_mode == 'V')
|
||||||
@@ -5592,24 +5590,7 @@ nv_gotofile(cap)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# ifdef FEAT_VISUAL
|
ptr = grab_file_name(cap->count1);
|
||||||
/*
|
|
||||||
* In Visual mode, use the selected text as a file name.
|
|
||||||
* Don't allow selection across multiple lines.
|
|
||||||
*/
|
|
||||||
if (VIsual_active)
|
|
||||||
{
|
|
||||||
int len;
|
|
||||||
|
|
||||||
if (get_visual_text(cap, &ptr, &len) == FAIL)
|
|
||||||
return;
|
|
||||||
ptr = find_file_name_in_path(ptr, len,
|
|
||||||
FNAME_MESS|FNAME_EXP|FNAME_REL, cap->count1, curbuf->b_ffname);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
# endif
|
|
||||||
ptr = file_name_at_cursor(FNAME_MESS|FNAME_HYP|FNAME_EXP|FNAME_REL,
|
|
||||||
cap->count1);
|
|
||||||
|
|
||||||
if (ptr != NULL)
|
if (ptr != NULL)
|
||||||
{
|
{
|
||||||
|
|||||||
18
src/option.c
18
src/option.c
@@ -2049,6 +2049,15 @@ static struct vimoption
|
|||||||
{(char_u *)0L, (char_u *)0L}
|
{(char_u *)0L, (char_u *)0L}
|
||||||
#endif
|
#endif
|
||||||
},
|
},
|
||||||
|
{"spellsuggest", "sps", P_STRING|P_VI_DEF,
|
||||||
|
#ifdef FEAT_SYN_HL
|
||||||
|
(char_u *)&p_sps, PV_NONE,
|
||||||
|
{(char_u *)"best", (char_u *)0L}
|
||||||
|
#else
|
||||||
|
(char_u *)NULL, PV_NONE,
|
||||||
|
{(char_u *)0L, (char_u *)0L}
|
||||||
|
#endif
|
||||||
|
},
|
||||||
{"splitbelow", "sb", P_BOOL|P_VI_DEF,
|
{"splitbelow", "sb", P_BOOL|P_VI_DEF,
|
||||||
#ifdef FEAT_WINDOWS
|
#ifdef FEAT_WINDOWS
|
||||||
(char_u *)&p_sb, PV_NONE,
|
(char_u *)&p_sb, PV_NONE,
|
||||||
@@ -4552,6 +4561,9 @@ didset_options()
|
|||||||
#if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS))
|
#if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS))
|
||||||
(void)opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE);
|
(void)opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef FEAT_SYN_HL
|
||||||
|
(void)opt_strings_flags(p_sps, p_sps_values, &sps_flags, FALSE);
|
||||||
|
#endif
|
||||||
#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
|
#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
|
||||||
(void)opt_strings_flags(p_toolbar, p_toolbar_values, &toolbar_flags, TRUE);
|
(void)opt_strings_flags(p_toolbar, p_toolbar_values, &toolbar_flags, TRUE);
|
||||||
#endif
|
#endif
|
||||||
@@ -5710,6 +5722,12 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* 'spellsuggest' */
|
||||||
|
else if (varp == &p_sps)
|
||||||
|
{
|
||||||
|
if (opt_strings_flags(p_sps, p_sps_values, &sps_flags, FALSE) != OK)
|
||||||
|
errmsg = e_invarg;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FEAT_AUTOCMD
|
#ifdef FEAT_AUTOCMD
|
||||||
|
|||||||
10
src/option.h
10
src/option.h
@@ -706,6 +706,16 @@ EXTERN int p_sta; /* 'smarttab' */
|
|||||||
#ifdef FEAT_WINDOWS
|
#ifdef FEAT_WINDOWS
|
||||||
EXTERN int p_sb; /* 'splitbelow' */
|
EXTERN int p_sb; /* 'splitbelow' */
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef FEAT_SYN_HL
|
||||||
|
EXTERN char_u *p_sps; /* 'spellsuggest' */
|
||||||
|
EXTERN unsigned sps_flags;
|
||||||
|
# ifdef IN_OPTION_C
|
||||||
|
static char *(p_sps_values[]) = {"best", "fast", "double", NULL};
|
||||||
|
# endif
|
||||||
|
# define SPS_BEST 0x01
|
||||||
|
# define SPS_FAST 0x02
|
||||||
|
# define SPS_DOUBLE 0x04
|
||||||
|
#endif
|
||||||
#ifdef FEAT_VERTSPLIT
|
#ifdef FEAT_VERTSPLIT
|
||||||
EXTERN int p_spr; /* 'splitright' */
|
EXTERN int p_spr; /* 'splitright' */
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1325,6 +1325,7 @@ tgetch(int *pmodifiers, char_u *pch2)
|
|||||||
* If time == -1, wait forever for characters.
|
* If time == -1, wait forever for characters.
|
||||||
* Returns the number of characters read into buf.
|
* Returns the number of characters read into buf.
|
||||||
*/
|
*/
|
||||||
|
/*ARGSUSED*/
|
||||||
int
|
int
|
||||||
mch_inchar(
|
mch_inchar(
|
||||||
char_u *buf,
|
char_u *buf,
|
||||||
@@ -4190,6 +4191,7 @@ mch_breakcheck(void)
|
|||||||
* How much memory is available?
|
* How much memory is available?
|
||||||
* Return sum of available physical and page file memory.
|
* Return sum of available physical and page file memory.
|
||||||
*/
|
*/
|
||||||
|
/*ARGSUSED*/
|
||||||
long_u
|
long_u
|
||||||
mch_avail_mem(int special)
|
mch_avail_mem(int special)
|
||||||
{
|
{
|
||||||
@@ -4867,7 +4869,7 @@ myresetstkoflw(void)
|
|||||||
/*
|
/*
|
||||||
* The command line arguments in UCS2
|
* The command line arguments in UCS2
|
||||||
*/
|
*/
|
||||||
static DWORD nArgsW = 0;
|
static int nArgsW = 0;
|
||||||
static LPWSTR *ArglistW = NULL;
|
static LPWSTR *ArglistW = NULL;
|
||||||
static int global_argc = 0;
|
static int global_argc = 0;
|
||||||
static char **global_argv;
|
static char **global_argv;
|
||||||
@@ -4994,7 +4996,7 @@ fix_arg_enc(void)
|
|||||||
* - the file name arguments must have been located.
|
* - the file name arguments must have been located.
|
||||||
* - the length of the argument list wasn't changed by the user.
|
* - the length of the argument list wasn't changed by the user.
|
||||||
*/
|
*/
|
||||||
if (global_argc != (int)nArgsW
|
if (global_argc != nArgsW
|
||||||
|| ArglistW == NULL
|
|| ArglistW == NULL
|
||||||
|| used_file_indexes == NULL
|
|| used_file_indexes == NULL
|
||||||
|| used_file_count == 0
|
|| used_file_count == 0
|
||||||
|
|||||||
@@ -20,5 +20,4 @@ void gui_mch_find_dialog __ARGS((exarg_T *eap));
|
|||||||
void gui_mch_replace_dialog __ARGS((exarg_T *eap));
|
void gui_mch_replace_dialog __ARGS((exarg_T *eap));
|
||||||
void gui_gtk_synch_fonts __ARGS((void));
|
void gui_gtk_synch_fonts __ARGS((void));
|
||||||
void ex_helpfind __ARGS((exarg_T *eap));
|
void ex_helpfind __ARGS((exarg_T *eap));
|
||||||
void gui_gtk_position_in_parent __ARGS((GtkWidget *parent, GtkWidget *child, gui_win_pos_T where));
|
|
||||||
/* vim: set ft=c : */
|
/* vim: set ft=c : */
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
/* netbeans.c */
|
/* netbeans.c */
|
||||||
void netbeans_w32_connect __ARGS((void));
|
|
||||||
void messageFromNetbeansW32 __ARGS((void));
|
void messageFromNetbeansW32 __ARGS((void));
|
||||||
int isNetbeansBuffer __ARGS((buf_T *bufp));
|
int isNetbeansBuffer __ARGS((buf_T *bufp));
|
||||||
int isNetbeansModified __ARGS((buf_T *bufp));
|
int isNetbeansModified __ARGS((buf_T *bufp));
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ void do_check_scrollbind __ARGS((int check));
|
|||||||
void check_scrollbind __ARGS((linenr_T topline_diff, long leftcol_diff));
|
void check_scrollbind __ARGS((linenr_T topline_diff, long leftcol_diff));
|
||||||
void scroll_redraw __ARGS((int up, long count));
|
void scroll_redraw __ARGS((int up, long count));
|
||||||
void do_nv_ident __ARGS((int c1, int c2));
|
void do_nv_ident __ARGS((int c1, int c2));
|
||||||
|
int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp));
|
||||||
void start_selection __ARGS((void));
|
void start_selection __ARGS((void));
|
||||||
void may_start_select __ARGS((int c));
|
void may_start_select __ARGS((int c));
|
||||||
/* vim: set ft=c : */
|
/* vim: set ft=c : */
|
||||||
|
|||||||
@@ -9,4 +9,5 @@ void ex_spell __ARGS((exarg_T *eap));
|
|||||||
void spell_add_word __ARGS((char_u *word, int len, int bad));
|
void spell_add_word __ARGS((char_u *word, int len, int bad));
|
||||||
void init_spell_chartab __ARGS((void));
|
void init_spell_chartab __ARGS((void));
|
||||||
void spell_suggest __ARGS((void));
|
void spell_suggest __ARGS((void));
|
||||||
|
void spell_suggest_list __ARGS((garray_T *gap, char_u *word, int maxcount));
|
||||||
/* vim: set ft=c : */
|
/* vim: set ft=c : */
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ void win_drag_vsep_line __ARGS((win_T *dragwin, int offset));
|
|||||||
void win_comp_scroll __ARGS((win_T *wp));
|
void win_comp_scroll __ARGS((win_T *wp));
|
||||||
void command_height __ARGS((long old_p_ch));
|
void command_height __ARGS((long old_p_ch));
|
||||||
void last_status __ARGS((int morewin));
|
void last_status __ARGS((int morewin));
|
||||||
|
char_u *grab_file_name __ARGS((long count));
|
||||||
char_u *file_name_at_cursor __ARGS((int options, long count));
|
char_u *file_name_at_cursor __ARGS((int options, long count));
|
||||||
char_u *file_name_in_line __ARGS((char_u *line, int col, int options, long count, char_u *rel_fname));
|
char_u *file_name_in_line __ARGS((char_u *line, int col, int options, long count, char_u *rel_fname));
|
||||||
char_u *find_file_name_in_path __ARGS((char_u *ptr, int len, int options, long count, char_u *rel_fname));
|
char_u *find_file_name_in_path __ARGS((char_u *ptr, int len, int options, long count, char_u *rel_fname));
|
||||||
|
|||||||
1439
src/spell.c
1439
src/spell.c
File diff suppressed because it is too large
Load Diff
@@ -46,6 +46,9 @@ diff:
|
|||||||
|
|
||||||
-diff -a -C 1 fr_FR.orig.aff fr_FR.aff >fr_FR.diff
|
-diff -a -C 1 fr_FR.orig.aff fr_FR.aff >fr_FR.diff
|
||||||
-diff -a -C 1 fr_FR.orig.dic fr_FR.dic >>fr_FR.diff
|
-diff -a -C 1 fr_FR.orig.dic fr_FR.dic >>fr_FR.diff
|
||||||
|
|
||||||
|
-diff -a -C 1 he_IL.orig.aff he_IL.aff >he_IL.diff
|
||||||
|
-diff -a -C 1 he_IL.orig.dic he_IL.dic >>he_IL.diff
|
||||||
|
|
||||||
$(SPELLDIR)/en.latin1.spl : $(VIM) \
|
$(SPELLDIR)/en.latin1.spl : $(VIM) \
|
||||||
en_US.aff en_US.dic \
|
en_US.aff en_US.dic \
|
||||||
|
|||||||
22
src/spell/de_DE.diff
Normal file
22
src/spell/de_DE.diff
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
*** de_DE.orig.aff Fri Jun 17 10:01:18 2005
|
||||||
|
--- de_DE.aff Sat Jun 18 19:46:19 2005
|
||||||
|
***************
|
||||||
|
*** 3,4 ****
|
||||||
|
--- 3,8 ----
|
||||||
|
|
||||||
|
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
+
|
||||||
|
# (c) copyright by Bjoern Jacke <bjoern@j3e.de>
|
||||||
|
*** de_DE.orig.dic Fri Jun 17 10:01:27 2005
|
||||||
|
--- de_DE.dic Sat Jun 18 19:57:07 2005
|
||||||
|
***************
|
||||||
|
*** 76258,76259 ****
|
||||||
|
zynismusf<73>rdernd/A
|
||||||
|
! zzgl
|
||||||
|
\ No newline at end of file
|
||||||
|
--- 76258,76260 ----
|
||||||
|
zynismusf<73>rdernd/A
|
||||||
|
! zzgl
|
||||||
|
!
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
*** en_AU.orig.aff Fri Apr 15 13:20:36 2005
|
*** en_AU.orig.aff Fri Apr 15 13:20:36 2005
|
||||||
--- en_AU.aff Sat Apr 23 19:57:40 2005
|
--- en_AU.aff Sat Jun 18 19:42:07 2005
|
||||||
***************
|
***************
|
||||||
*** 7,9 ****
|
*** 7,9 ****
|
||||||
SET ISO8859-1
|
SET ISO8859-1
|
||||||
@@ -9,9 +9,9 @@
|
|||||||
SET ISO8859-1
|
SET ISO8859-1
|
||||||
! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
!
|
!
|
||||||
! FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
! LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
! UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
!
|
!
|
||||||
!
|
!
|
||||||
REP 24
|
REP 24
|
||||||
@@ -2227,49 +2227,161 @@
|
|||||||
! SFX 3 o ist's o
|
! SFX 3 o ist's o
|
||||||
! SFX 3 0 ist's [^eoy]
|
! SFX 3 0 ist's [^eoy]
|
||||||
*** en_AU.orig.dic Fri Apr 15 13:20:36 2005
|
*** en_AU.orig.dic Fri Apr 15 13:20:36 2005
|
||||||
--- en_AU.dic Tue Apr 19 22:19:18 2005
|
--- en_AU.dic Tue Jun 21 20:24:15 2005
|
||||||
|
***************
|
||||||
|
*** 912,914 ****
|
||||||
|
Alaska/M
|
||||||
|
! al/AY
|
||||||
|
albacore/MS
|
||||||
|
--- 912,914 ----
|
||||||
|
Alaska/M
|
||||||
|
! really
|
||||||
|
albacore/MS
|
||||||
|
***************
|
||||||
|
*** 4885,4887 ****
|
||||||
|
bozo/SM
|
||||||
|
- b/pb
|
||||||
|
bpi
|
||||||
|
--- 4885,4886 ----
|
||||||
***************
|
***************
|
||||||
*** 4921,4922 ****
|
*** 4921,4922 ****
|
||||||
--- 4921,4923 ----
|
--- 4920,4922 ----
|
||||||
Brahms
|
Brahms
|
||||||
+ Bram/M
|
+ Bram/M
|
||||||
braid/DGS
|
braid/DGS
|
||||||
***************
|
***************
|
||||||
|
*** 10288,10289 ****
|
||||||
|
--- 10288,10292 ----
|
||||||
|
dB/M
|
||||||
|
+ dBi
|
||||||
|
+ dBm
|
||||||
|
+ dBd
|
||||||
|
DBMS
|
||||||
|
***************
|
||||||
*** 12468,12469 ****
|
*** 12468,12469 ****
|
||||||
--- 12469,12471 ----
|
--- 12471,12473 ----
|
||||||
Dutch/5m
|
Dutch/5m
|
||||||
+ Farsi
|
+ Farsi
|
||||||
Dutchwomen/M
|
Dutchwomen/M
|
||||||
***************
|
***************
|
||||||
|
*** 13779,13781 ****
|
||||||
|
estuary/MS
|
||||||
|
! et
|
||||||
|
ETA
|
||||||
|
--- 13783,13786 ----
|
||||||
|
estuary/MS
|
||||||
|
! et cetera
|
||||||
|
! et al.
|
||||||
|
ETA
|
||||||
|
***************
|
||||||
*** 19214,19216 ****
|
*** 19214,19216 ****
|
||||||
Hobbes
|
Hobbes
|
||||||
! hobbit
|
! hobbit
|
||||||
hobble/RGSD
|
hobble/RGSD
|
||||||
--- 19216,19218 ----
|
--- 19219,19221 ----
|
||||||
Hobbes
|
Hobbes
|
||||||
! hobbit/MS
|
! hobbit/MS
|
||||||
hobble/RGSD
|
hobble/RGSD
|
||||||
***************
|
***************
|
||||||
|
*** 22885,22887 ****
|
||||||
|
lass/SM
|
||||||
|
- last-ditch
|
||||||
|
lasted/e
|
||||||
|
--- 22890,22891 ----
|
||||||
|
***************
|
||||||
|
*** 22890,22892 ****
|
||||||
|
last/kJYDSG
|
||||||
|
- last-minute
|
||||||
|
lasts/e
|
||||||
|
--- 22894,22895 ----
|
||||||
|
***************
|
||||||
*** 26417,26418 ****
|
*** 26417,26418 ****
|
||||||
--- 26419,26421 ----
|
--- 26420,26422 ----
|
||||||
Moolawatana
|
Moolawatana
|
||||||
+ Moolenaar/M
|
+ Moolenaar/M
|
||||||
Moomba
|
Moomba
|
||||||
***************
|
***************
|
||||||
|
*** 27188,27192 ****
|
||||||
|
nationals/4
|
||||||
|
! national/sQq3S
|
||||||
|
nationhood/M
|
||||||
|
! nation/M
|
||||||
|
nationwide
|
||||||
|
--- 27192,27196 ----
|
||||||
|
nationals/4
|
||||||
|
! national/sQq3SZ
|
||||||
|
nationhood/M
|
||||||
|
! nation/MS
|
||||||
|
nationwide
|
||||||
|
***************
|
||||||
|
*** 27194,27195 ****
|
||||||
|
--- 27198,27201 ----
|
||||||
|
nativity/MS
|
||||||
|
+ natively
|
||||||
|
+ nativeness
|
||||||
|
NATO/M
|
||||||
|
***************
|
||||||
|
*** 31035,31037 ****
|
||||||
|
Pk
|
||||||
|
- p/KF
|
||||||
|
pl.
|
||||||
|
--- 31041,31042 ----
|
||||||
|
***************
|
||||||
|
*** 31288,31289 ****
|
||||||
|
--- 31293,31295 ----
|
||||||
|
pneumonia/MS
|
||||||
|
+ pneumonic
|
||||||
|
PO
|
||||||
|
***************
|
||||||
|
*** 31460,31461 ****
|
||||||
|
--- 31466,31468 ----
|
||||||
|
pompom/MS
|
||||||
|
+ pompon/M
|
||||||
|
pomposity/MS
|
||||||
|
***************
|
||||||
|
*** 33378,33380 ****
|
||||||
|
razzmatazz
|
||||||
|
- r/d
|
||||||
|
Rd/M
|
||||||
|
--- 33385,33386 ----
|
||||||
|
***************
|
||||||
|
*** 34979,34981 ****
|
||||||
|
RSPCA
|
||||||
|
- rte
|
||||||
|
rub-a-dub
|
||||||
|
--- 34985,34986 ----
|
||||||
|
***************
|
||||||
*** 36012,36014 ****
|
*** 36012,36014 ****
|
||||||
sec.
|
sec.
|
||||||
! s/eca
|
! s/eca
|
||||||
secant/MS
|
secant/MS
|
||||||
--- 36015,36017 ----
|
--- 36017,36019 ----
|
||||||
sec.
|
sec.
|
||||||
! outs
|
! outs
|
||||||
secant/MS
|
secant/MS
|
||||||
***************
|
***************
|
||||||
|
*** 42616,42618 ****
|
||||||
|
Tyson/M
|
||||||
|
- u
|
||||||
|
ubiquitousness
|
||||||
|
--- 42621,42622 ----
|
||||||
|
***************
|
||||||
|
*** 42990,42991 ****
|
||||||
|
--- 42994,42996 ----
|
||||||
|
unscrupulous
|
||||||
|
+ searchable
|
||||||
|
unsearchable
|
||||||
|
***************
|
||||||
*** 43749,43751 ****
|
*** 43749,43751 ****
|
||||||
Vilnius/M
|
Vilnius/M
|
||||||
! vim/M
|
! vim/M
|
||||||
vinaigrette/MS
|
vinaigrette/MS
|
||||||
--- 43752,43754 ----
|
--- 43754,43756 ----
|
||||||
Vilnius/M
|
Vilnius/M
|
||||||
! Vim/M
|
! Vim/M
|
||||||
vinaigrette/MS
|
vinaigrette/MS
|
||||||
|
***************
|
||||||
|
*** 45655 ****
|
||||||
|
--- 45660,45661 ----
|
||||||
|
zymurgy/S
|
||||||
|
+ nd
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
*** en_CA.orig.aff Fri Apr 15 13:20:36 2005
|
*** en_CA.orig.aff Fri Apr 15 13:20:36 2005
|
||||||
--- en_CA.aff Sat Apr 23 19:57:43 2005
|
--- en_CA.aff Sat Jun 18 19:42:19 2005
|
||||||
***************
|
***************
|
||||||
*** 3,4 ****
|
*** 3,4 ****
|
||||||
--- 3,8 ----
|
--- 3,8 ----
|
||||||
|
|
||||||
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+
|
+
|
||||||
PFX A Y 1
|
PFX A Y 1
|
||||||
***************
|
***************
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
! SFX G 0 ing [^e]
|
! SFX G 0 ing [^e]
|
||||||
|
|
||||||
*** en_CA.orig.dic Sat Apr 16 14:40:06 2005
|
*** en_CA.orig.dic Sat Apr 16 14:40:06 2005
|
||||||
--- en_CA.dic Tue Apr 19 22:19:46 2005
|
--- en_CA.dic Tue Jun 21 20:25:01 2005
|
||||||
***************
|
***************
|
||||||
*** 46,48 ****
|
*** 46,48 ****
|
||||||
R/G
|
R/G
|
||||||
@@ -47,32 +47,150 @@
|
|||||||
easternmost
|
easternmost
|
||||||
--- 46,47 ----
|
--- 46,47 ----
|
||||||
***************
|
***************
|
||||||
*** 89,91 ****
|
*** 59,61 ****
|
||||||
r/GVTJ
|
a
|
||||||
|
! b/KGDT
|
||||||
|
Emmey/M
|
||||||
|
--- 58,61 ----
|
||||||
|
a
|
||||||
|
! probing
|
||||||
|
! probed
|
||||||
|
Emmey/M
|
||||||
|
***************
|
||||||
|
*** 82,84 ****
|
||||||
|
m/XG
|
||||||
|
! n/FKT
|
||||||
|
o
|
||||||
|
--- 82,84 ----
|
||||||
|
m/XG
|
||||||
|
! pron
|
||||||
|
o
|
||||||
|
***************
|
||||||
|
*** 86,91 ****
|
||||||
|
fitting/PSY
|
||||||
|
- p/KRT
|
||||||
|
q
|
||||||
|
! r/GVTJ
|
||||||
! s/FK
|
! s/FK
|
||||||
fatting
|
fatting
|
||||||
--- 88,90 ----
|
--- 86,89 ----
|
||||||
r/GVTJ
|
fitting/PSY
|
||||||
|
q
|
||||||
! cons
|
! cons
|
||||||
fatting
|
fatting
|
||||||
***************
|
***************
|
||||||
|
*** 94,96 ****
|
||||||
|
oedipal
|
||||||
|
- u
|
||||||
|
v/VTK
|
||||||
|
--- 92,93 ----
|
||||||
|
***************
|
||||||
|
*** 3145,3146 ****
|
||||||
|
--- 3142,3144 ----
|
||||||
|
semester/MS
|
||||||
|
+ etc.
|
||||||
|
etch/GZSRDJ
|
||||||
|
***************
|
||||||
|
*** 7022,7024 ****
|
||||||
|
DA
|
||||||
|
- DB
|
||||||
|
DC
|
||||||
|
--- 7020,7021 ----
|
||||||
|
***************
|
||||||
|
*** 8388,8390 ****
|
||||||
|
slotting
|
||||||
|
- ON
|
||||||
|
OR
|
||||||
|
--- 8385,8386 ----
|
||||||
|
***************
|
||||||
|
*** 9125,9127 ****
|
||||||
|
perchance
|
||||||
|
- rte
|
||||||
|
hastiness/MS
|
||||||
|
--- 9121,9122 ----
|
||||||
|
***************
|
||||||
|
*** 10603,10604 ****
|
||||||
|
--- 10598,10602 ----
|
||||||
|
dB/M
|
||||||
|
+ dBi
|
||||||
|
+ dBm
|
||||||
|
+ dBd
|
||||||
|
Hewet/M
|
||||||
|
***************
|
||||||
|
*** 10615,10617 ****
|
||||||
|
Garold/M
|
||||||
|
- db
|
||||||
|
tollhouse/M
|
||||||
|
--- 10613,10614 ----
|
||||||
|
***************
|
||||||
|
*** 11017,11019 ****
|
||||||
|
hr
|
||||||
|
- ht
|
||||||
|
MCI/M
|
||||||
|
--- 11014,11015 ----
|
||||||
|
***************
|
||||||
|
*** 11609,11611 ****
|
||||||
|
demureness/SM
|
||||||
|
! nd/A
|
||||||
|
MIA
|
||||||
|
--- 11605,11607 ----
|
||||||
|
demureness/SM
|
||||||
|
! nd
|
||||||
|
MIA
|
||||||
|
***************
|
||||||
*** 13669,13671 ****
|
*** 13669,13671 ****
|
||||||
engross/LDRSG
|
engross/LDRSG
|
||||||
! hobbit
|
! hobbit
|
||||||
certainty/MUS
|
certainty/MUS
|
||||||
--- 13668,13670 ----
|
--- 13665,13667 ----
|
||||||
engross/LDRSG
|
engross/LDRSG
|
||||||
! hobbit/MS
|
! hobbit/MS
|
||||||
certainty/MUS
|
certainty/MUS
|
||||||
***************
|
***************
|
||||||
|
*** 14434,14435 ****
|
||||||
|
--- 14430,14432 ----
|
||||||
|
pompom/MS
|
||||||
|
+ pompon/M
|
||||||
|
Devland/M
|
||||||
|
***************
|
||||||
|
*** 19265,19267 ****
|
||||||
|
bloodstone/M
|
||||||
|
! cetera/S
|
||||||
|
storm/SGZRDM
|
||||||
|
--- 19262,19264 ----
|
||||||
|
bloodstone/M
|
||||||
|
! et cetera/S
|
||||||
|
storm/SGZRDM
|
||||||
|
***************
|
||||||
|
*** 20162,20164 ****
|
||||||
|
Hansel/M
|
||||||
|
! ring/GZJDRM
|
||||||
|
Hansen/M
|
||||||
|
--- 20159,20161 ----
|
||||||
|
Hansel/M
|
||||||
|
! ring/GZJDRMS
|
||||||
|
Hansen/M
|
||||||
|
***************
|
||||||
|
*** 28157,28158 ****
|
||||||
|
--- 28154,28156 ----
|
||||||
|
pneumonia/MS
|
||||||
|
+ pneumonic
|
||||||
|
Socratic/S
|
||||||
|
***************
|
||||||
|
*** 34999,35001 ****
|
||||||
|
claque/MS
|
||||||
|
- etc
|
||||||
|
Chad/M
|
||||||
|
--- 34997,34998 ----
|
||||||
|
***************
|
||||||
*** 36707,36708 ****
|
*** 36707,36708 ****
|
||||||
--- 36706,36708 ----
|
--- 36704,36706 ----
|
||||||
Moody/M
|
Moody/M
|
||||||
+ Moolenaar/M
|
+ Moolenaar/M
|
||||||
Bresenham/M
|
Bresenham/M
|
||||||
***************
|
***************
|
||||||
*** 50272,50273 ****
|
*** 50272,50273 ****
|
||||||
--- 50272,50274 ----
|
--- 50270,50272 ----
|
||||||
Dutch/M
|
Dutch/M
|
||||||
+ Farsi
|
+ Farsi
|
||||||
Sharon/M
|
Sharon/M
|
||||||
@@ -81,7 +199,18 @@
|
|||||||
hatchery/MS
|
hatchery/MS
|
||||||
! vim/SM
|
! vim/SM
|
||||||
compatriot/MS
|
compatriot/MS
|
||||||
--- 52566,52568 ----
|
--- 52564,52566 ----
|
||||||
hatchery/MS
|
hatchery/MS
|
||||||
! Vim/SM
|
! Vim/SM
|
||||||
compatriot/MS
|
compatriot/MS
|
||||||
|
***************
|
||||||
|
*** 53490,53491 ****
|
||||||
|
--- 53489,53491 ----
|
||||||
|
unsearchable
|
||||||
|
+ searchable
|
||||||
|
felicitous/IY
|
||||||
|
***************
|
||||||
|
*** 62341 ****
|
||||||
|
--- 62341,62342 ----
|
||||||
|
data/M
|
||||||
|
+ et al.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
*** en_GB.orig.aff Fri Apr 15 13:20:36 2005
|
*** en_GB.orig.aff Fri Apr 15 13:20:36 2005
|
||||||
--- en_GB.aff Sat Apr 23 19:57:46 2005
|
--- en_GB.aff Sat Jun 18 19:42:24 2005
|
||||||
***************
|
***************
|
||||||
*** 7,9 ****
|
*** 7,9 ****
|
||||||
SET ISO8859-1
|
SET ISO8859-1
|
||||||
@@ -9,9 +9,9 @@
|
|||||||
SET ISO8859-1
|
SET ISO8859-1
|
||||||
! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
!
|
!
|
||||||
! FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
! LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
! UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
!
|
!
|
||||||
REP 24
|
REP 24
|
||||||
***************
|
***************
|
||||||
@@ -2226,38 +2226,130 @@
|
|||||||
! SFX 3 o ist's o
|
! SFX 3 o ist's o
|
||||||
! SFX 3 0 ist's [^eoy]
|
! SFX 3 0 ist's [^eoy]
|
||||||
*** en_GB.orig.dic Sun Apr 17 18:08:50 2005
|
*** en_GB.orig.dic Sun Apr 17 18:08:50 2005
|
||||||
--- en_GB.dic Tue Apr 19 22:20:16 2005
|
--- en_GB.dic Tue Jun 21 20:26:11 2005
|
||||||
|
***************
|
||||||
|
*** 187,189 ****
|
||||||
|
aitch/SM
|
||||||
|
- al/FAC
|
||||||
|
al-Jazeera
|
||||||
|
--- 187,188 ----
|
||||||
|
***************
|
||||||
|
*** 2148,2150 ****
|
||||||
|
dazzle/DRkGJS
|
||||||
|
- dBm
|
||||||
|
DC
|
||||||
|
--- 2147,2148 ----
|
||||||
|
***************
|
||||||
|
*** 4637,4639 ****
|
||||||
|
lass/MS
|
||||||
|
- last-minute
|
||||||
|
lasts/e
|
||||||
|
--- 4635,4636 ----
|
||||||
|
***************
|
||||||
|
*** 5470,5472 ****
|
||||||
|
M<>nchhausen/M
|
||||||
|
- n/NxnVvu
|
||||||
|
N'Djamena
|
||||||
|
--- 5467,5468 ----
|
||||||
|
***************
|
||||||
|
*** 5499,5501 ****
|
||||||
|
natch
|
||||||
|
! nation/M
|
||||||
|
nationalises/A
|
||||||
|
--- 5495,5497 ----
|
||||||
|
natch
|
||||||
|
! nation/MS
|
||||||
|
nationalises/A
|
||||||
|
***************
|
||||||
|
*** 6316,6317 ****
|
||||||
|
--- 6312,6314 ----
|
||||||
|
pompom/SM
|
||||||
|
+ pompon/M
|
||||||
|
ponce/M
|
||||||
***************
|
***************
|
||||||
*** 7048,7050 ****
|
*** 7048,7050 ****
|
||||||
r<>gime/SM
|
r<>gime/SM
|
||||||
! s/ok7
|
! s/ok7
|
||||||
Saab/M
|
Saab/M
|
||||||
--- 7048,7050 ----
|
--- 7045,7047 ----
|
||||||
r<>gime/SM
|
r<>gime/SM
|
||||||
! singly
|
! singly
|
||||||
Saab/M
|
Saab/M
|
||||||
***************
|
***************
|
||||||
|
*** 11148,11149 ****
|
||||||
|
--- 11145,11148 ----
|
||||||
|
dBi
|
||||||
|
+ dBm
|
||||||
|
+ dBd
|
||||||
|
DCB
|
||||||
|
***************
|
||||||
|
*** 14591,14592 ****
|
||||||
|
--- 14590,14592 ----
|
||||||
|
native/SP
|
||||||
|
+ natively
|
||||||
|
nativity/SM
|
||||||
|
***************
|
||||||
|
*** 16172,16174 ****
|
||||||
|
RSPCA
|
||||||
|
- rte
|
||||||
|
rubati
|
||||||
|
--- 16172,16173 ----
|
||||||
|
***************
|
||||||
|
*** 17808,17809 ****
|
||||||
|
--- 17807,17809 ----
|
||||||
|
unsearchable
|
||||||
|
+ searchable
|
||||||
|
unshakable/Y
|
||||||
|
***************
|
||||||
|
*** 18322,18323 ****
|
||||||
|
--- 18322,18324 ----
|
||||||
|
<20>migr<67>/S
|
||||||
|
+ nd
|
||||||
|
3GPP
|
||||||
|
***************
|
||||||
*** 19303,19304 ****
|
*** 19303,19304 ****
|
||||||
--- 19303,19305 ----
|
--- 19304,19306 ----
|
||||||
Brampton/M
|
Brampton/M
|
||||||
+ Bram/M
|
+ Bram/M
|
||||||
brand/MRDGSZ
|
brand/MRDGSZ
|
||||||
***************
|
***************
|
||||||
|
*** 21097,21099 ****
|
||||||
|
estimative
|
||||||
|
! et
|
||||||
|
etalon
|
||||||
|
--- 21099,21102 ----
|
||||||
|
estimative
|
||||||
|
! et cetera
|
||||||
|
! et al.
|
||||||
|
etalon
|
||||||
|
***************
|
||||||
*** 23632,23633 ****
|
*** 23632,23633 ****
|
||||||
--- 23633,23635 ----
|
--- 23635,23637 ----
|
||||||
Moog
|
Moog
|
||||||
+ Moolenaar/M
|
+ Moolenaar/M
|
||||||
moonlight/GRDSM
|
moonlight/GRDSM
|
||||||
***************
|
***************
|
||||||
|
*** 24242,24244 ****
|
||||||
|
oxygenation/M
|
||||||
|
- p/FYAI
|
||||||
|
Pablo/M
|
||||||
|
--- 24246,24247 ----
|
||||||
|
***************
|
||||||
*** 27223,27225 ****
|
*** 27223,27225 ****
|
||||||
Villiers
|
Villiers
|
||||||
! vim/M
|
! vim/M
|
||||||
Vinci/M
|
Vinci/M
|
||||||
--- 27225,27227 ----
|
--- 27226,27228 ----
|
||||||
Villiers
|
Villiers
|
||||||
! Vim/M
|
! Vim/M
|
||||||
Vinci/M
|
Vinci/M
|
||||||
***************
|
***************
|
||||||
|
*** 28174,28176 ****
|
||||||
|
Aztec/M
|
||||||
|
- b/bp
|
||||||
|
Baal/M
|
||||||
|
--- 28177,28178 ----
|
||||||
|
***************
|
||||||
*** 31409,31411 ****
|
*** 31409,31411 ****
|
||||||
hob/MDGZS
|
hob/MDGZS
|
||||||
! hobbit
|
! hobbit
|
||||||
@@ -2266,3 +2358,21 @@
|
|||||||
hob/MDGZS
|
hob/MDGZS
|
||||||
! hobbit/MS
|
! hobbit/MS
|
||||||
Hobbs
|
Hobbs
|
||||||
|
***************
|
||||||
|
*** 32174,32176 ****
|
||||||
|
lasso/GMDS
|
||||||
|
- last-ditch
|
||||||
|
Laszlo/M
|
||||||
|
--- 32176,32177 ----
|
||||||
|
***************
|
||||||
|
*** 43275,43276 ****
|
||||||
|
--- 43276,43278 ----
|
||||||
|
pneumonia/MS
|
||||||
|
+ pneumonic
|
||||||
|
PO
|
||||||
|
***************
|
||||||
|
*** 43665,43667 ****
|
||||||
|
qwerty
|
||||||
|
- r/d
|
||||||
|
Ra
|
||||||
|
--- 43667,43668 ----
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
*** en_NZ.orig.aff Fri Apr 15 13:20:36 2005
|
*** en_NZ.orig.aff Fri Apr 15 13:20:36 2005
|
||||||
--- en_NZ.aff Sat Apr 23 19:57:49 2005
|
--- en_NZ.aff Sat Jun 18 19:42:31 2005
|
||||||
***************
|
***************
|
||||||
*** 7,9 ****
|
*** 7,9 ****
|
||||||
SET ISO8859-1
|
SET ISO8859-1
|
||||||
@@ -9,9 +9,9 @@
|
|||||||
SET ISO8859-1
|
SET ISO8859-1
|
||||||
! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
!
|
!
|
||||||
! FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
! LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
! UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
! UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
!
|
!
|
||||||
REP 66
|
REP 66
|
||||||
***************
|
***************
|
||||||
@@ -2227,17 +2227,32 @@
|
|||||||
! SFX 3 o ist's o
|
! SFX 3 o ist's o
|
||||||
! SFX 3 0 ist's [^eoy]
|
! SFX 3 0 ist's [^eoy]
|
||||||
*** en_NZ.orig.dic Fri Apr 15 13:20:36 2005
|
*** en_NZ.orig.dic Fri Apr 15 13:20:36 2005
|
||||||
--- en_NZ.dic Sun Apr 17 18:08:55 2005
|
--- en_NZ.dic Tue Jun 21 20:14:24 2005
|
||||||
|
***************
|
||||||
|
*** 1,6 ****
|
||||||
|
47141
|
||||||
|
- 3GPP
|
||||||
|
- 2YA
|
||||||
|
- 2ZB
|
||||||
|
- A
|
||||||
|
a/o
|
||||||
|
--- 1,2 ----
|
||||||
|
***************
|
||||||
|
*** 927,929 ****
|
||||||
|
Al-Zawahiri
|
||||||
|
- al/FAC
|
||||||
|
Al/M
|
||||||
|
--- 923,924 ----
|
||||||
***************
|
***************
|
||||||
*** 2941,2944 ****
|
*** 2941,2944 ****
|
||||||
B.Sc.
|
B.Sc.
|
||||||
- bless
|
- bless
|
||||||
- bible
|
- bible
|
||||||
baa/GSD
|
baa/GSD
|
||||||
--- 2941,2942 ----
|
--- 2936,2937 ----
|
||||||
***************
|
***************
|
||||||
*** 4974,4975 ****
|
*** 4974,4975 ****
|
||||||
--- 4972,4974 ----
|
--- 4967,4969 ----
|
||||||
Brampton/M
|
Brampton/M
|
||||||
+ Bram/M
|
+ Bram/M
|
||||||
bran/SDGM
|
bran/SDGM
|
||||||
@@ -2246,7 +2261,7 @@
|
|||||||
C.Lit.
|
C.Lit.
|
||||||
! cation/SM
|
! cation/SM
|
||||||
Ca/y
|
Ca/y
|
||||||
--- 5706,5708 ----
|
--- 5701,5703 ----
|
||||||
C.Lit.
|
C.Lit.
|
||||||
! cation/MWS
|
! cation/MWS
|
||||||
Ca/y
|
Ca/y
|
||||||
@@ -2255,16 +2270,22 @@
|
|||||||
Cathy
|
Cathy
|
||||||
- cation/MW
|
- cation/MW
|
||||||
catkin/SM
|
catkin/SM
|
||||||
--- 6449,6450 ----
|
--- 6444,6445 ----
|
||||||
***************
|
***************
|
||||||
*** 10153,10155 ****
|
*** 10153,10155 ****
|
||||||
red's
|
red's
|
||||||
- dally
|
- dally
|
||||||
dab/TSGD
|
dab/TSGD
|
||||||
--- 10151,10152 ----
|
--- 10146,10147 ----
|
||||||
|
***************
|
||||||
|
*** 10360,10361 ****
|
||||||
|
--- 10352,10354 ----
|
||||||
|
dBm
|
||||||
|
+ dBd
|
||||||
|
DBMS
|
||||||
***************
|
***************
|
||||||
*** 12535,12536 ****
|
*** 12535,12536 ****
|
||||||
--- 12532,12534 ----
|
--- 12528,12530 ----
|
||||||
Dutchwomen/M
|
Dutchwomen/M
|
||||||
+ Farsi
|
+ Farsi
|
||||||
duteous/Y
|
duteous/Y
|
||||||
@@ -2273,20 +2294,30 @@
|
|||||||
duvet/SM
|
duvet/SM
|
||||||
- duxes
|
- duxes
|
||||||
DVD/MS
|
DVD/MS
|
||||||
--- 12540,12541 ----
|
--- 12536,12537 ----
|
||||||
|
***************
|
||||||
|
*** 13901,13903 ****
|
||||||
|
estuary/MS
|
||||||
|
! et
|
||||||
|
ETA
|
||||||
|
--- 13894,13897 ----
|
||||||
|
estuary/MS
|
||||||
|
! et cetera
|
||||||
|
! et al.
|
||||||
|
ETA
|
||||||
***************
|
***************
|
||||||
*** 14531,14534 ****
|
*** 14531,14534 ****
|
||||||
f-stop/S
|
f-stop/S
|
||||||
- fable
|
- fable
|
||||||
- fist/MS
|
- fist/MS
|
||||||
fa/M
|
fa/M
|
||||||
--- 14528,14529 ----
|
--- 14525,14526 ----
|
||||||
***************
|
***************
|
||||||
*** 15323,15325 ****
|
*** 15323,15325 ****
|
||||||
fissure/DSMG
|
fissure/DSMG
|
||||||
! fist/6GD
|
! fist/6GD
|
||||||
fistfight/MS
|
fistfight/MS
|
||||||
--- 15318,15320 ----
|
--- 15315,15317 ----
|
||||||
fissure/DSMG
|
fissure/DSMG
|
||||||
! fist/6GDMS
|
! fist/6GDMS
|
||||||
fistfight/MS
|
fistfight/MS
|
||||||
@@ -2295,37 +2326,44 @@
|
|||||||
g's
|
g's
|
||||||
- gable
|
- gable
|
||||||
gist/MS
|
gist/MS
|
||||||
--- 16601,16602 ----
|
--- 16598,16599 ----
|
||||||
***************
|
***************
|
||||||
*** 16797,16799 ****
|
*** 16797,16799 ****
|
||||||
Garvey
|
Garvey
|
||||||
- Gary/M
|
- Gary/M
|
||||||
gas-permeable
|
gas-permeable
|
||||||
--- 16791,16792 ----
|
--- 16788,16789 ----
|
||||||
***************
|
***************
|
||||||
*** 18177,18179 ****
|
*** 18177,18179 ****
|
||||||
gyroscope/SWM
|
gyroscope/SWM
|
||||||
- dish
|
- dish
|
||||||
ha
|
ha
|
||||||
--- 18170,18171 ----
|
--- 18167,18168 ----
|
||||||
***************
|
***************
|
||||||
*** 22321,22323 ****
|
*** 22321,22323 ****
|
||||||
K-factor
|
K-factor
|
||||||
- disk/MS
|
- disk/MS
|
||||||
kabob's
|
kabob's
|
||||||
--- 22313,22314 ----
|
--- 22310,22311 ----
|
||||||
|
***************
|
||||||
|
*** 23129,23132 ****
|
||||||
|
lassoer/M
|
||||||
|
- last-ditch
|
||||||
|
- last-minute
|
||||||
|
last/YSDGkJ
|
||||||
|
--- 23117,23118 ----
|
||||||
***************
|
***************
|
||||||
*** 26396,26398 ****
|
*** 26396,26398 ****
|
||||||
Missy
|
Missy
|
||||||
! mist/CDRGS
|
! mist/CDRGS
|
||||||
mistakable/U
|
mistakable/U
|
||||||
--- 26387,26389 ----
|
--- 26382,26384 ----
|
||||||
Missy
|
Missy
|
||||||
! mist/CDRGSM
|
! mist/CDRGSM
|
||||||
mistakable/U
|
mistakable/U
|
||||||
***************
|
***************
|
||||||
*** 26745,26746 ****
|
*** 26745,26746 ****
|
||||||
--- 26736,26738 ----
|
--- 26731,26733 ----
|
||||||
Moog
|
Moog
|
||||||
+ Moolenaar/M
|
+ Moolenaar/M
|
||||||
moon/MGpDS
|
moon/MGpDS
|
||||||
@@ -2334,7 +2372,7 @@
|
|||||||
mozzarella/SM
|
mozzarella/SM
|
||||||
- MP3
|
- MP3
|
||||||
mpg
|
mpg
|
||||||
--- 27010,27011 ----
|
--- 27005,27006 ----
|
||||||
***************
|
***************
|
||||||
*** 27365,27372 ****
|
*** 27365,27372 ****
|
||||||
N'Djamena
|
N'Djamena
|
||||||
@@ -2345,7 +2383,7 @@
|
|||||||
- national
|
- national
|
||||||
- nationally
|
- nationally
|
||||||
Na/M
|
Na/M
|
||||||
--- 27356,27360 ----
|
--- 27351,27355 ----
|
||||||
N'Djamena
|
N'Djamena
|
||||||
! native/SP
|
! native/SP
|
||||||
natively
|
natively
|
||||||
@@ -2356,7 +2394,7 @@
|
|||||||
Nathaniel/M
|
Nathaniel/M
|
||||||
! nation/M
|
! nation/M
|
||||||
national/sQ3Sq
|
national/sQ3Sq
|
||||||
--- 27495,27497 ----
|
--- 27490,27492 ----
|
||||||
Nathaniel/M
|
Nathaniel/M
|
||||||
! nation/MS
|
! nation/MS
|
||||||
national/sQ3Sq
|
national/sQ3Sq
|
||||||
@@ -2365,7 +2403,7 @@
|
|||||||
nationwide
|
nationwide
|
||||||
- native/SP
|
- native/SP
|
||||||
nativity/SM
|
nativity/SM
|
||||||
--- 27509,27510 ----
|
--- 27504,27505 ----
|
||||||
***************
|
***************
|
||||||
*** 29852,29857 ****
|
*** 29852,29857 ****
|
||||||
P.O.
|
P.O.
|
||||||
@@ -2374,27 +2412,57 @@
|
|||||||
- imply
|
- imply
|
||||||
- comply
|
- comply
|
||||||
pa/oM
|
pa/oM
|
||||||
--- 29839,29840 ----
|
--- 29834,29835 ----
|
||||||
|
***************
|
||||||
|
*** 31702,31703 ****
|
||||||
|
--- 31680,31682 ----
|
||||||
|
pneumonia/MS
|
||||||
|
+ pneumonic
|
||||||
|
PO
|
||||||
|
***************
|
||||||
|
*** 31885,31886 ****
|
||||||
|
--- 31864,31866 ----
|
||||||
|
pompom/SM
|
||||||
|
+ pompon/M
|
||||||
|
pomposity/SM
|
||||||
|
***************
|
||||||
|
*** 33561,33563 ****
|
||||||
|
qwertys
|
||||||
|
- r/d
|
||||||
|
Ra
|
||||||
|
--- 33541,33542 ----
|
||||||
|
***************
|
||||||
|
*** 35456,35458 ****
|
||||||
|
rt
|
||||||
|
- rte
|
||||||
|
Ru/M
|
||||||
|
--- 35435,35436 ----
|
||||||
***************
|
***************
|
||||||
*** 35619,35622 ****
|
*** 35619,35622 ****
|
||||||
singly
|
singly
|
||||||
- sable
|
- sable
|
||||||
- sally/DSG
|
- sally/DSG
|
||||||
SA
|
SA
|
||||||
--- 35602,35603 ----
|
--- 35597,35598 ----
|
||||||
***************
|
***************
|
||||||
*** 40763,40766 ****
|
*** 40763,40766 ****
|
||||||
T's
|
T's
|
||||||
- mist/MS
|
- mist/MS
|
||||||
- overt
|
- overt
|
||||||
Ta
|
Ta
|
||||||
--- 40744,40745 ----
|
--- 40739,40740 ----
|
||||||
|
***************
|
||||||
|
*** 43574,43575 ****
|
||||||
|
--- 43548,43550 ----
|
||||||
|
unsearchable
|
||||||
|
+ searchable
|
||||||
|
unseeing/Y
|
||||||
***************
|
***************
|
||||||
*** 44334,44336 ****
|
*** 44334,44336 ****
|
||||||
Vilnius/M
|
Vilnius/M
|
||||||
! vim/M
|
! vim/M
|
||||||
vinaigrette/MS
|
vinaigrette/MS
|
||||||
--- 44313,44315 ----
|
--- 44309,44311 ----
|
||||||
Vilnius/M
|
Vilnius/M
|
||||||
! Vim/M
|
! Vim/M
|
||||||
vinaigrette/MS
|
vinaigrette/MS
|
||||||
@@ -2403,66 +2471,73 @@
|
|||||||
y'all
|
y'all
|
||||||
- prey/M
|
- prey/M
|
||||||
yacht/M5SmGD
|
yacht/M5SmGD
|
||||||
--- 45885,45886 ----
|
--- 45881,45882 ----
|
||||||
***************
|
***************
|
||||||
*** 46198,46200 ****
|
*** 46198,46200 ****
|
||||||
rata/M
|
rata/M
|
||||||
- kaka/M
|
- kaka/M
|
||||||
waka/M
|
waka/M
|
||||||
--- 46176,46177 ----
|
--- 46172,46173 ----
|
||||||
***************
|
***************
|
||||||
*** 46216,46218 ****
|
*** 46216,46218 ****
|
||||||
jandal/MS
|
jandal/MS
|
||||||
- Swanndri/M
|
- Swanndri/M
|
||||||
hoon/MS
|
hoon/MS
|
||||||
--- 46193,46194 ----
|
--- 46189,46190 ----
|
||||||
***************
|
***************
|
||||||
*** 46242,46244 ****
|
*** 46242,46244 ****
|
||||||
Invercargill/M
|
Invercargill/M
|
||||||
- Te
|
- Te
|
||||||
Alexandra/M
|
Alexandra/M
|
||||||
--- 46218,46219 ----
|
--- 46214,46215 ----
|
||||||
***************
|
***************
|
||||||
*** 46261,46263 ****
|
*** 46261,46263 ****
|
||||||
Kawerau/M
|
Kawerau/M
|
||||||
- Kerikeri/M
|
- Kerikeri/M
|
||||||
Lyttelton/M
|
Lyttelton/M
|
||||||
--- 46236,46237 ----
|
--- 46232,46233 ----
|
||||||
***************
|
***************
|
||||||
*** 46491,46493 ****
|
*** 46491,46493 ****
|
||||||
Waianakarua
|
Waianakarua
|
||||||
- Hakatere
|
- Hakatere
|
||||||
Swin
|
Swin
|
||||||
--- 46465,46466 ----
|
--- 46461,46462 ----
|
||||||
***************
|
***************
|
||||||
*** 46690,46692 ****
|
*** 46690,46692 ****
|
||||||
Omarama/M
|
Omarama/M
|
||||||
- Wairarapa/M
|
- Wairarapa/M
|
||||||
Kilda/M
|
Kilda/M
|
||||||
--- 46663,46664 ----
|
--- 46659,46660 ----
|
||||||
***************
|
***************
|
||||||
*** 46711,46713 ****
|
*** 46711,46713 ****
|
||||||
Wellsford/M
|
Wellsford/M
|
||||||
- Akaroa/M
|
- Akaroa/M
|
||||||
Avonhead/M
|
Avonhead/M
|
||||||
--- 46683,46684 ----
|
--- 46679,46680 ----
|
||||||
|
***************
|
||||||
|
*** 46838,46840 ****
|
||||||
|
Ballantyne's
|
||||||
|
- DB
|
||||||
|
Monteith's
|
||||||
|
--- 46805,46806 ----
|
||||||
***************
|
***************
|
||||||
*** 46920,46922 ****
|
*** 46920,46922 ****
|
||||||
Egmont/M
|
Egmont/M
|
||||||
- Waitaki/M
|
- Waitaki/M
|
||||||
katipo/M
|
katipo/M
|
||||||
--- 46891,46892 ----
|
--- 46886,46887 ----
|
||||||
***************
|
***************
|
||||||
*** 46956,46958 ****
|
*** 46956,46958 ****
|
||||||
Sunnyside/M
|
Sunnyside/M
|
||||||
- Wairau/M
|
- Wairau/M
|
||||||
Waikoropupu
|
Waikoropupu
|
||||||
--- 46926,46927 ----
|
--- 46921,46922 ----
|
||||||
***************
|
***************
|
||||||
*** 47141,47142 ****
|
*** 47141,47142 ****
|
||||||
Burkina
|
Burkina
|
||||||
! Faso/M
|
! Faso/M
|
||||||
\ No newline at end of file
|
\ No newline at end of file
|
||||||
--- 47110,47111 ----
|
--- 47105,47107 ----
|
||||||
Burkina
|
Burkina
|
||||||
! Faso/M
|
! Faso/M
|
||||||
|
! nd
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
*** en_US.orig.aff Fri Apr 15 13:20:36 2005
|
*** en_US.orig.aff Fri Apr 15 13:20:36 2005
|
||||||
--- en_US.aff Sat Apr 23 19:57:52 2005
|
--- en_US.aff Tue Jun 21 20:46:52 2005
|
||||||
***************
|
***************
|
||||||
*** 3,4 ****
|
*** 3,4 ****
|
||||||
--- 3,8 ----
|
--- 3,10 ----
|
||||||
|
|
||||||
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
+
|
||||||
|
+ RAR ?
|
||||||
+
|
+
|
||||||
PFX A Y 1
|
PFX A Y 1
|
||||||
***************
|
***************
|
||||||
@@ -15,7 +17,7 @@
|
|||||||
! SFX N y ication y
|
! SFX N y ication y
|
||||||
! SFX N 0 en [^ey]
|
! SFX N 0 en [^ey]
|
||||||
|
|
||||||
--- 34,37 ----
|
--- 36,39 ----
|
||||||
SFX N e ion e
|
SFX N e ion e
|
||||||
! SFX N y ication y
|
! SFX N y ication y
|
||||||
! SFX N 0 en [^ey]
|
! SFX N 0 en [^ey]
|
||||||
@@ -25,7 +27,7 @@
|
|||||||
SFX H y ieth y
|
SFX H y ieth y
|
||||||
! SFX H 0 th [^y]
|
! SFX H 0 th [^y]
|
||||||
|
|
||||||
--- 44,46 ----
|
--- 46,48 ----
|
||||||
SFX H y ieth y
|
SFX H y ieth y
|
||||||
! SFX H 0 th [^y]
|
! SFX H 0 th [^y]
|
||||||
|
|
||||||
@@ -34,69 +36,334 @@
|
|||||||
SFX G e ing e
|
SFX G e ing e
|
||||||
! SFX G 0 ing [^e]
|
! SFX G 0 ing [^e]
|
||||||
|
|
||||||
--- 51,53 ----
|
--- 53,55 ----
|
||||||
SFX G e ing e
|
SFX G e ing e
|
||||||
! SFX G 0 ing [^e]
|
! SFX G 0 ing [^e]
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 137,138 ****
|
||||||
|
--- 143,146 ----
|
||||||
|
REP uy i
|
||||||
|
+ REP y ie
|
||||||
|
+ REP ie y
|
||||||
|
REP i ee
|
||||||
|
***************
|
||||||
|
*** 188 ****
|
||||||
|
--- 196,317 ----
|
||||||
|
REP shun cion
|
||||||
|
+
|
||||||
|
+ MAP 5
|
||||||
|
+ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
+ MAP e<><65><EFBFBD><EFBFBD>
|
||||||
|
+ MAP i<><69><EFBFBD><EFBFBD>
|
||||||
|
+ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
+ MAP u<><75><EFBFBD><EFBFBD>
|
||||||
|
+ MAP n<>
|
||||||
|
+ MAP c<>
|
||||||
|
+ MAP y<><79>
|
||||||
|
+ MAP s<>
|
||||||
|
+
|
||||||
|
+ # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
|
||||||
|
+
|
||||||
|
+ SAL AH(AEIOUY)-^ *H
|
||||||
|
+ SAL AR(AEIOUY)-^ *R
|
||||||
|
+ SAL A(HR)^ *
|
||||||
|
+ SAL A^ *
|
||||||
|
+ SAL AH(AEIOUY)- H
|
||||||
|
+ SAL AR(AEIOUY)- R
|
||||||
|
+ SAL A(HR) _
|
||||||
|
+ SAL <20>^ *
|
||||||
|
+ SAL <20>^ *
|
||||||
|
+ SAL BB- _
|
||||||
|
+ SAL B B
|
||||||
|
+ SAL CQ- _
|
||||||
|
+ SAL CIA X
|
||||||
|
+ SAL CH X
|
||||||
|
+ SAL C(EIY)- S
|
||||||
|
+ SAL CK K
|
||||||
|
+ SAL COUGH^ KF
|
||||||
|
+ SAL CC< C
|
||||||
|
+ SAL C K
|
||||||
|
+ SAL DG(EIY) K
|
||||||
|
+ SAL DD- _
|
||||||
|
+ SAL D T
|
||||||
|
+ SAL <20>< E
|
||||||
|
+ SAL EH(AEIOUY)-^ *H
|
||||||
|
+ SAL ER(AEIOUY)-^ *R
|
||||||
|
+ SAL E(HR)^ *
|
||||||
|
+ SAL ENOUGH^$ *NF
|
||||||
|
+ SAL E^ *
|
||||||
|
+ SAL EH(AEIOUY)- H
|
||||||
|
+ SAL ER(AEIOUY)- R
|
||||||
|
+ SAL E(HR) _
|
||||||
|
+ SAL FF- _
|
||||||
|
+ SAL F F
|
||||||
|
+ SAL GN^ N
|
||||||
|
+ SAL GN$ N
|
||||||
|
+ SAL GNS$ NS
|
||||||
|
+ SAL GNED$ N
|
||||||
|
+ SAL GH(AEIOUY)- K
|
||||||
|
+ SAL GH _
|
||||||
|
+ SAL GG9 K
|
||||||
|
+ SAL G K
|
||||||
|
+ SAL H H
|
||||||
|
+ SAL IH(AEIOUY)-^ *H
|
||||||
|
+ SAL IR(AEIOUY)-^ *R
|
||||||
|
+ SAL I(HR)^ *
|
||||||
|
+ SAL I^ *
|
||||||
|
+ SAL ING6 N
|
||||||
|
+ SAL IH(AEIOUY)- H
|
||||||
|
+ SAL IR(AEIOUY)- R
|
||||||
|
+ SAL I(HR) _
|
||||||
|
+ SAL J K
|
||||||
|
+ SAL KN^ N
|
||||||
|
+ SAL KK- _
|
||||||
|
+ SAL K K
|
||||||
|
+ SAL LAUGH^ LF
|
||||||
|
+ SAL LL- _
|
||||||
|
+ SAL L L
|
||||||
|
+ SAL MB$ M
|
||||||
|
+ SAL MM M
|
||||||
|
+ SAL M M
|
||||||
|
+ SAL NN- _
|
||||||
|
+ SAL N N
|
||||||
|
+ SAL OH(AEIOUY)-^ *H
|
||||||
|
+ SAL OR(AEIOUY)-^ *R
|
||||||
|
+ SAL O(HR)^ *
|
||||||
|
+ SAL O^ *
|
||||||
|
+ SAL OH(AEIOUY)- H
|
||||||
|
+ SAL OR(AEIOUY)- R
|
||||||
|
+ SAL O(HR) _
|
||||||
|
+ SAL PH F
|
||||||
|
+ SAL PN^ N
|
||||||
|
+ SAL PP- _
|
||||||
|
+ SAL P P
|
||||||
|
+ SAL Q K
|
||||||
|
+ SAL RH^ R
|
||||||
|
+ SAL ROUGH^ RF
|
||||||
|
+ SAL RR- _
|
||||||
|
+ SAL R R
|
||||||
|
+ SAL SCH(EOU)- SK
|
||||||
|
+ SAL SC(IEY)- S
|
||||||
|
+ SAL SH X
|
||||||
|
+ SAL SI(AO)- X
|
||||||
|
+ SAL SS- _
|
||||||
|
+ SAL S S
|
||||||
|
+ SAL TI(AO)- X
|
||||||
|
+ SAL TH @
|
||||||
|
+ SAL TCH-- _
|
||||||
|
+ SAL TOUGH^ TF
|
||||||
|
+ SAL TT- _
|
||||||
|
+ SAL T T
|
||||||
|
+ SAL UH(AEIOUY)-^ *H
|
||||||
|
+ SAL UR(AEIOUY)-^ *R
|
||||||
|
+ SAL U(HR)^ *
|
||||||
|
+ SAL U^ *
|
||||||
|
+ SAL UH(AEIOUY)- H
|
||||||
|
+ SAL UR(AEIOUY)- R
|
||||||
|
+ SAL U(HR) _
|
||||||
|
+ SAL V^ W
|
||||||
|
+ SAL V F
|
||||||
|
+ SAL WR^ R
|
||||||
|
+ SAL WH^ W
|
||||||
|
+ SAL W(AEIOU)- W
|
||||||
|
+ SAL X^ S
|
||||||
|
+ SAL X KS
|
||||||
|
+ SAL Y(AEIOU)- Y
|
||||||
|
+ SAL ZZ- _
|
||||||
|
+ SAL Z S
|
||||||
*** en_US.orig.dic Fri Apr 15 13:20:36 2005
|
*** en_US.orig.dic Fri Apr 15 13:20:36 2005
|
||||||
--- en_US.dic Tue Apr 19 23:08:36 2005
|
--- en_US.dic Tue Jun 21 20:26:22 2005
|
||||||
|
***************
|
||||||
|
*** 5944,5946 ****
|
||||||
|
bk
|
||||||
|
! b/KGD
|
||||||
|
Bk/M
|
||||||
|
--- 5944,5947 ----
|
||||||
|
bk
|
||||||
|
! probing
|
||||||
|
! probed
|
||||||
|
Bk/M
|
||||||
|
***************
|
||||||
|
*** 9233,9235 ****
|
||||||
|
cetacean/S
|
||||||
|
- cetera/S
|
||||||
|
Cetus/M
|
||||||
|
--- 9234,9235 ----
|
||||||
|
***************
|
||||||
|
*** 14038,14043 ****
|
||||||
|
dazzling/Y
|
||||||
|
- db
|
||||||
|
- DB
|
||||||
|
dbl
|
||||||
|
dB/M
|
||||||
|
DBMS
|
||||||
|
--- 14038,14044 ----
|
||||||
|
dazzling/Y
|
||||||
|
dbl
|
||||||
|
dB/M
|
||||||
|
+ dBi
|
||||||
|
+ dBm
|
||||||
|
+ dBd
|
||||||
|
DBMS
|
||||||
***************
|
***************
|
||||||
*** 16911,16912 ****
|
*** 16911,16912 ****
|
||||||
--- 16911,16913 ----
|
--- 16912,16914 ----
|
||||||
dusty/RPT
|
dusty/RPT
|
||||||
+ Farsi
|
+ Farsi
|
||||||
Dutch/M
|
Dutch/M
|
||||||
***************
|
***************
|
||||||
|
*** 18780,18782 ****
|
||||||
|
estuary/SM
|
||||||
|
! et
|
||||||
|
ET
|
||||||
|
--- 18782,18785 ----
|
||||||
|
estuary/SM
|
||||||
|
! et cetera/S
|
||||||
|
! et al.
|
||||||
|
ET
|
||||||
|
***************
|
||||||
|
*** 18785,18787 ****
|
||||||
|
eta/SM
|
||||||
|
! etc
|
||||||
|
etcetera/SM
|
||||||
|
--- 18788,18790 ----
|
||||||
|
eta/SM
|
||||||
|
! etc.
|
||||||
|
etcetera/SM
|
||||||
|
***************
|
||||||
*** 25963,25965 ****
|
*** 25963,25965 ****
|
||||||
hobbing
|
hobbing
|
||||||
! hobbit
|
! hobbit
|
||||||
hobbler/M
|
hobbler/M
|
||||||
--- 25964,25966 ----
|
--- 25966,25968 ----
|
||||||
hobbing
|
hobbing
|
||||||
! hobbit/MS
|
! hobbit/MS
|
||||||
hobbler/M
|
hobbler/M
|
||||||
***************
|
***************
|
||||||
|
*** 26524,26526 ****
|
||||||
|
HST
|
||||||
|
- ht
|
||||||
|
HTML
|
||||||
|
--- 26527,26528 ----
|
||||||
|
***************
|
||||||
|
*** 34746,34747 ****
|
||||||
|
--- 34748,34751 ----
|
||||||
|
Mb
|
||||||
|
+ Mbyte
|
||||||
|
+ Mbit
|
||||||
|
MB
|
||||||
|
***************
|
||||||
*** 36605,36606 ****
|
*** 36605,36606 ****
|
||||||
--- 36606,36608 ----
|
--- 36609,36611 ----
|
||||||
Moog
|
Moog
|
||||||
+ Moolenaar/M
|
+ Moolenaar/M
|
||||||
moo/GSD
|
moo/GSD
|
||||||
***************
|
***************
|
||||||
*** 38871,38873 ****
|
*** 38871,38873 ****
|
||||||
NSF
|
NSF
|
||||||
! n/T
|
- n/T
|
||||||
NT
|
|
||||||
--- 38873,38875 ----
|
|
||||||
NSF
|
|
||||||
! n
|
|
||||||
NT
|
NT
|
||||||
|
--- 38876,38877 ----
|
||||||
|
***************
|
||||||
|
*** 39532,39534 ****
|
||||||
|
om/XN
|
||||||
|
- ON
|
||||||
|
onanism/M
|
||||||
|
--- 39536,39537 ----
|
||||||
|
***************
|
||||||
|
*** 42508,42510 ****
|
||||||
|
pinfeather/SM
|
||||||
|
! ping/GDRM
|
||||||
|
pinheaded/P
|
||||||
|
--- 42511,42513 ----
|
||||||
|
pinfeather/SM
|
||||||
|
! ping/GDRMS
|
||||||
|
pinheaded/P
|
||||||
|
***************
|
||||||
|
*** 42983,42984 ****
|
||||||
|
--- 42986,42988 ----
|
||||||
|
pneumonia/MS
|
||||||
|
+ pneumonic
|
||||||
|
PO
|
||||||
|
***************
|
||||||
|
*** 43216,43218 ****
|
||||||
|
pompom/SM
|
||||||
|
! pompon's
|
||||||
|
pomposity/MS
|
||||||
|
--- 43220,43222 ----
|
||||||
|
pompom/SM
|
||||||
|
! pompon/M
|
||||||
|
pomposity/MS
|
||||||
|
***************
|
||||||
|
*** 44940,44942 ****
|
||||||
|
PX
|
||||||
|
- p/XTGJ
|
||||||
|
Pygmalion/M
|
||||||
|
--- 44944,44945 ----
|
||||||
***************
|
***************
|
||||||
*** 46507,46509 ****
|
*** 46507,46509 ****
|
||||||
Renault/MS
|
Renault/MS
|
||||||
- rend
|
- rend
|
||||||
renderer/M
|
renderer/M
|
||||||
--- 46509,46510 ----
|
--- 46510,46511 ----
|
||||||
|
***************
|
||||||
|
*** 47258,47260 ****
|
||||||
|
ringer/M
|
||||||
|
! ring/GZJDRM
|
||||||
|
ringing/Y
|
||||||
|
--- 47260,47262 ----
|
||||||
|
ringer/M
|
||||||
|
! ring/GZJDRMS
|
||||||
|
ringing/Y
|
||||||
|
***************
|
||||||
|
*** 47857,47862 ****
|
||||||
|
rt
|
||||||
|
- rte
|
||||||
|
Rte
|
||||||
|
RTFM
|
||||||
|
- r/TGVJ
|
||||||
|
Rubaiyat/M
|
||||||
|
--- 47859,47862 ----
|
||||||
***************
|
***************
|
||||||
*** 48085,48087 ****
|
*** 48085,48087 ****
|
||||||
Ryun/M
|
Ryun/M
|
||||||
- S
|
- S
|
||||||
SA
|
SA
|
||||||
--- 48086,48087 ----
|
--- 48085,48086 ----
|
||||||
***************
|
***************
|
||||||
*** 54450,54452 ****
|
*** 54450,54452 ****
|
||||||
swung
|
swung
|
||||||
! s/XJBG
|
! s/XJBG
|
||||||
sybarite/MS
|
sybarite/MS
|
||||||
--- 54450,54452 ----
|
--- 54449,54451 ----
|
||||||
swung
|
swung
|
||||||
! sings
|
! sings
|
||||||
sybarite/MS
|
sybarite/MS
|
||||||
***************
|
***************
|
||||||
|
*** 57809,57811 ****
|
||||||
|
Tzeltal/M
|
||||||
|
- u
|
||||||
|
U
|
||||||
|
--- 57808,57809 ----
|
||||||
|
***************
|
||||||
|
*** 58494,58495 ****
|
||||||
|
--- 58492,58494 ----
|
||||||
|
unsearchable
|
||||||
|
+ searchable
|
||||||
|
unseasonal
|
||||||
|
***************
|
||||||
*** 59538,59540 ****
|
*** 59538,59540 ****
|
||||||
vi/MDR
|
vi/MDR
|
||||||
! vim/MS
|
! vim/MS
|
||||||
vinaigrette/MS
|
vinaigrette/MS
|
||||||
--- 59538,59540 ----
|
--- 59537,59539 ----
|
||||||
vi/MDR
|
vi/MDR
|
||||||
! Vim/MS
|
! Vim/MS
|
||||||
vinaigrette/MS
|
vinaigrette/MS
|
||||||
|
***************
|
||||||
|
*** 62077 ****
|
||||||
|
--- 62076,62078 ----
|
||||||
|
zymurgy/S
|
||||||
|
+ the the/?
|
||||||
|
+ nd
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
*** fr_FR.orig.aff Sun Apr 14 17:18:22 2002
|
*** fr_FR.orig.aff Sun Apr 14 17:18:22 2002
|
||||||
--- fr_FR.aff Sat Apr 23 19:57:26 2005
|
--- fr_FR.aff Sat Jun 18 19:43:02 2005
|
||||||
***************
|
***************
|
||||||
*** 3,4 ****
|
*** 3,4 ****
|
||||||
--- 3,8 ----
|
--- 3,8 ----
|
||||||
|
|
||||||
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+
|
+
|
||||||
PFX A Y 10
|
PFX A Y 10
|
||||||
|
|||||||
10
src/spell/he_IL.diff
Normal file
10
src/spell/he_IL.diff
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
*** he_IL.orig.aff Sat Jun 18 14:46:51 2005
|
||||||
|
--- he_IL.aff Sat Jun 18 15:13:34 2005
|
||||||
|
***************
|
||||||
|
*** 2,3 ****
|
||||||
|
--- 2,6 ----
|
||||||
|
TRY <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
+
|
||||||
|
+ PFXPOSTPONE
|
||||||
|
+
|
||||||
|
# This file was generated automatically from data prepared
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
*** nl_NL.orig.aff Wed Apr 20 11:48:16 2005
|
*** nl_NL.orig.aff Wed Apr 20 11:48:16 2005
|
||||||
--- nl_NL.aff Sat Apr 23 16:48:27 2005
|
--- nl_NL.aff Tue Jun 21 11:08:32 2005
|
||||||
***************
|
***************
|
||||||
*** 3,4 ****
|
*** 3,4 ****
|
||||||
--- 3,8 ----
|
--- 3,8 ----
|
||||||
|
|
||||||
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+
|
+
|
||||||
NOSPLITSUGS
|
NOSPLITSUGS
|
||||||
***************
|
***************
|
||||||
@@ -111,43 +111,380 @@
|
|||||||
! REP kontekst context
|
! REP kontekst context
|
||||||
! REP korrekt correct
|
! REP korrekt correct
|
||||||
REP kritikus criticus
|
REP kritikus criticus
|
||||||
|
***************
|
||||||
|
*** 333 ****
|
||||||
|
--- 337,458 ----
|
||||||
|
REP aflassen afgelasten
|
||||||
|
+
|
||||||
|
+ MAP 5
|
||||||
|
+ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
+ MAP e<><65><EFBFBD><EFBFBD>
|
||||||
|
+ MAP i<><69><EFBFBD><EFBFBD>
|
||||||
|
+ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
+ MAP u<><75><EFBFBD><EFBFBD>
|
||||||
|
+ MAP n<>
|
||||||
|
+ MAP c<>
|
||||||
|
+ MAP y<><79>
|
||||||
|
+ MAP s<>
|
||||||
|
+
|
||||||
|
+ # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
|
||||||
|
+
|
||||||
|
+ SAL AH(AEIOUY)-^ *H
|
||||||
|
+ SAL AR(AEIOUY)-^ *R
|
||||||
|
+ SAL A(HR)^ *
|
||||||
|
+ SAL A^ *
|
||||||
|
+ SAL AH(AEIOUY)- H
|
||||||
|
+ SAL AR(AEIOUY)- R
|
||||||
|
+ SAL A(HR) _
|
||||||
|
+ SAL <20>^ *
|
||||||
|
+ SAL <20>^ *
|
||||||
|
+ SAL BB- _
|
||||||
|
+ SAL B B
|
||||||
|
+ SAL CQ- _
|
||||||
|
+ SAL CIA X
|
||||||
|
+ SAL CH X
|
||||||
|
+ SAL C(EIY)- S
|
||||||
|
+ SAL CK K
|
||||||
|
+ SAL COUGH^ KF
|
||||||
|
+ SAL CC< C
|
||||||
|
+ SAL C K
|
||||||
|
+ SAL DG(EIY) K
|
||||||
|
+ SAL DD- _
|
||||||
|
+ SAL D T
|
||||||
|
+ SAL <20>< E
|
||||||
|
+ SAL EH(AEIOUY)-^ *H
|
||||||
|
+ SAL ER(AEIOUY)-^ *R
|
||||||
|
+ SAL E(HR)^ *
|
||||||
|
+ SAL ENOUGH^$ *NF
|
||||||
|
+ SAL E^ *
|
||||||
|
+ SAL EH(AEIOUY)- H
|
||||||
|
+ SAL ER(AEIOUY)- R
|
||||||
|
+ SAL E(HR) _
|
||||||
|
+ SAL FF- _
|
||||||
|
+ SAL F F
|
||||||
|
+ SAL GN^ N
|
||||||
|
+ SAL GN$ N
|
||||||
|
+ SAL GNS$ NS
|
||||||
|
+ SAL GNED$ N
|
||||||
|
+ SAL GH(AEIOUY)- K
|
||||||
|
+ SAL GH _
|
||||||
|
+ SAL GG9 K
|
||||||
|
+ SAL G K
|
||||||
|
+ SAL H H
|
||||||
|
+ SAL IH(AEIOUY)-^ *H
|
||||||
|
+ SAL IR(AEIOUY)-^ *R
|
||||||
|
+ SAL I(HR)^ *
|
||||||
|
+ SAL I^ *
|
||||||
|
+ SAL ING6 N
|
||||||
|
+ SAL IH(AEIOUY)- H
|
||||||
|
+ SAL IR(AEIOUY)- R
|
||||||
|
+ SAL I(HR) _
|
||||||
|
+ SAL J K
|
||||||
|
+ SAL KN^ N
|
||||||
|
+ SAL KK- _
|
||||||
|
+ SAL K K
|
||||||
|
+ SAL LAUGH^ LF
|
||||||
|
+ SAL LL- _
|
||||||
|
+ SAL L L
|
||||||
|
+ SAL MB$ M
|
||||||
|
+ SAL MM M
|
||||||
|
+ SAL M M
|
||||||
|
+ SAL NN- _
|
||||||
|
+ SAL N N
|
||||||
|
+ SAL OH(AEIOUY)-^ *H
|
||||||
|
+ SAL OR(AEIOUY)-^ *R
|
||||||
|
+ SAL O(HR)^ *
|
||||||
|
+ SAL O^ *
|
||||||
|
+ SAL OH(AEIOUY)- H
|
||||||
|
+ SAL OR(AEIOUY)- R
|
||||||
|
+ SAL O(HR) _
|
||||||
|
+ SAL PH F
|
||||||
|
+ SAL PN^ N
|
||||||
|
+ SAL PP- _
|
||||||
|
+ SAL P P
|
||||||
|
+ SAL Q K
|
||||||
|
+ SAL RH^ R
|
||||||
|
+ SAL ROUGH^ RF
|
||||||
|
+ SAL RR- _
|
||||||
|
+ SAL R R
|
||||||
|
+ SAL SCH(EOU)- SK
|
||||||
|
+ SAL SC(IEY)- S
|
||||||
|
+ SAL SH X
|
||||||
|
+ SAL SI(AO)- X
|
||||||
|
+ SAL SS- _
|
||||||
|
+ SAL S S
|
||||||
|
+ SAL TI(AO)- X
|
||||||
|
+ SAL TH @
|
||||||
|
+ SAL TCH-- _
|
||||||
|
+ SAL TOUGH^ TF
|
||||||
|
+ SAL TT- _
|
||||||
|
+ SAL T T
|
||||||
|
+ SAL UH(AEIOUY)-^ *H
|
||||||
|
+ SAL UR(AEIOUY)-^ *R
|
||||||
|
+ SAL U(HR)^ *
|
||||||
|
+ SAL U^ *
|
||||||
|
+ SAL UH(AEIOUY)- H
|
||||||
|
+ SAL UR(AEIOUY)- R
|
||||||
|
+ SAL U(HR) _
|
||||||
|
+ SAL V^ W
|
||||||
|
+ SAL V F
|
||||||
|
+ SAL WR^ R
|
||||||
|
+ SAL WH^ W
|
||||||
|
+ SAL W(AEIOU)- W
|
||||||
|
+ SAL X^ S
|
||||||
|
+ SAL X KS
|
||||||
|
+ SAL Y(AEIOU)- Y
|
||||||
|
+ SAL ZZ- _
|
||||||
|
+ SAL Z S
|
||||||
*** nl_NL.orig.dic Tue Apr 19 21:03:15 2005
|
*** nl_NL.orig.dic Tue Apr 19 21:03:15 2005
|
||||||
--- nl_NL.dic Wed Apr 20 18:47:07 2005
|
--- nl_NL.dic Wed Jun 15 10:36:20 2005
|
||||||
|
***************
|
||||||
|
*** 8,9 ****
|
||||||
|
--- 8,11 ----
|
||||||
|
's-Hertogenbosch
|
||||||
|
+ fietsstandaard
|
||||||
|
+ fietslantaarn
|
||||||
|
A4
|
||||||
***************
|
***************
|
||||||
*** 91,93 ****
|
*** 91,93 ****
|
||||||
Athene
|
Athene
|
||||||
- Athene
|
- Athene
|
||||||
Atjees/E
|
Atjees/E
|
||||||
--- 91,92 ----
|
--- 93,94 ----
|
||||||
***************
|
***************
|
||||||
*** 216,217 ****
|
*** 216,217 ****
|
||||||
--- 215,218 ----
|
--- 217,220 ----
|
||||||
Brussels/E
|
Brussels/E
|
||||||
+ BTW
|
+ BTW
|
||||||
+ B.T.W.
|
+ B.T.W.
|
||||||
Budel
|
Budel
|
||||||
***************
|
***************
|
||||||
*** 325,326 ****
|
*** 325,326 ****
|
||||||
--- 326,328 ----
|
--- 328,330 ----
|
||||||
Duurstede
|
Duurstede
|
||||||
+ DVD
|
+ DVD
|
||||||
Dwingeloo
|
Dwingeloo
|
||||||
***************
|
***************
|
||||||
*** 813,814 ****
|
*** 7485,7486 ****
|
||||||
--- 815,817 ----
|
--- 7489,7493 ----
|
||||||
Montfort
|
avond/SN
|
||||||
+ Moolenaar/X
|
+ 's avonds
|
||||||
Moordrecht
|
+ 's middags
|
||||||
|
+ 's ochtends
|
||||||
|
avondapp<70>l/S
|
||||||
|
***************
|
||||||
|
*** 20681,20682 ****
|
||||||
|
--- 20688,20690 ----
|
||||||
|
cytostatica
|
||||||
|
+ d.m.v.
|
||||||
|
daad/P
|
||||||
***************
|
***************
|
||||||
*** 46300,46301 ****
|
*** 46300,46301 ****
|
||||||
--- 46303,46305 ----
|
--- 46308,46310 ----
|
||||||
informaticus
|
informaticus
|
||||||
+ informatie/S
|
+ informatie/S
|
||||||
informatie-uitwisseling
|
informatie-uitwisseling
|
||||||
***************
|
***************
|
||||||
*** 60206,60207 ****
|
*** 60206,60208 ****
|
||||||
--- 60210,60213 ----
|
--- 60215,60222 ----
|
||||||
l<>ss
|
l<>ss
|
||||||
+ m.a.w.
|
+ m.a.w.
|
||||||
+ m.b.t.
|
+ m.b.t.
|
||||||
|
+ m.n.
|
||||||
ma/JW
|
ma/JW
|
||||||
|
+ mm
|
||||||
|
+ mg
|
||||||
|
maag
|
||||||
|
***************
|
||||||
|
*** 97474,97475 ****
|
||||||
|
--- 97488,97490 ----
|
||||||
|
su<73>ciderisico/X
|
||||||
|
+ s.v.p.
|
||||||
|
swagger/S
|
||||||
|
***************
|
||||||
|
*** 101428,101429 ****
|
||||||
|
--- 101443,101446 ----
|
||||||
|
toezichthouder/S
|
||||||
|
+ toezichthoudersaansprakelijkheidsverzekering
|
||||||
|
+ toezichthoudersaansprakelijkheidsverzekeringen
|
||||||
|
toezie/N
|
||||||
|
***************
|
||||||
|
*** 103707,103708 ****
|
||||||
|
--- 103724,103726 ----
|
||||||
|
t<>te-<2D>-t<>te/S
|
||||||
|
+ u
|
||||||
|
uchtend/N
|
||||||
|
***************
|
||||||
|
*** 119938 ****
|
||||||
|
--- 119956,120126 ----
|
||||||
|
<20>berhaupt
|
||||||
|
+ Christiaan/X
|
||||||
|
+ Fred/X
|
||||||
|
+ Jansen/X
|
||||||
|
+ Janssen/X
|
||||||
|
+ Moolenaar/X
|
||||||
|
+ Renee/X
|
||||||
|
+ Ren<65>/X
|
||||||
|
+ Ren<65>e/X
|
||||||
|
+ Walter/X
|
||||||
|
+ # toevoegingen uit de Woordenlijst van 30 mei 1996
|
||||||
|
+ a capella
|
||||||
|
+ a fortiori
|
||||||
|
+ a priori
|
||||||
|
+ a vista
|
||||||
|
+ ad hominem
|
||||||
|
+ afrikaan
|
||||||
|
+ afterpil
|
||||||
|
+ alma mater
|
||||||
|
+ anorexia nervosa
|
||||||
|
+ apelazerus
|
||||||
|
+ art nouveau
|
||||||
|
+ au bain marie
|
||||||
|
+ auctor intellectualis
|
||||||
|
+ auctor intellectualis
|
||||||
|
+ avant la lettre
|
||||||
|
+ bal masqu<71>
|
||||||
|
+ basso continuo
|
||||||
|
+ batavier
|
||||||
|
+ benefit of the doubt
|
||||||
|
+ black box
|
||||||
|
+ black jack
|
||||||
|
+ black power
|
||||||
|
+ blue jeans
|
||||||
|
+ boogie woogie
|
||||||
|
+ bric <20> brac
|
||||||
|
+ bungee jumping
|
||||||
|
+ capita selecta
|
||||||
|
+ chaise longue
|
||||||
|
+ chinezen
|
||||||
|
+ coming man
|
||||||
|
+ comme il faut
|
||||||
|
+ commedia dell' arte
|
||||||
|
+ communis opinio
|
||||||
|
+ consilium abeundi
|
||||||
|
+ couleur locale
|
||||||
|
+ co<63>te que co<63>te
|
||||||
|
+ dalai lama
|
||||||
|
+ de jure
|
||||||
|
+ deus ex machina
|
||||||
|
+ domus Dei
|
||||||
|
+ dramatis personae
|
||||||
|
+ eigener beweging
|
||||||
|
+ en plein public
|
||||||
|
+ en profil
|
||||||
|
+ enfant terrible
|
||||||
|
+ entre nous
|
||||||
|
+ fait accompli
|
||||||
|
+ faux pas
|
||||||
|
+ femme fatale
|
||||||
|
+ filet d'anvers
|
||||||
|
+ fin de si<73>cle
|
||||||
|
+ finishing touch
|
||||||
|
+ franse
|
||||||
|
+ fransman
|
||||||
|
+ gotisch
|
||||||
|
+ happy few
|
||||||
|
+ hora est
|
||||||
|
+ hors d'oeuvre
|
||||||
|
+ in absentia
|
||||||
|
+ in abstracto
|
||||||
|
+ in allen gevalle
|
||||||
|
+ in extenso
|
||||||
|
+ in koelen bloede
|
||||||
|
+ in memoriam
|
||||||
|
+ in statu nascendi
|
||||||
|
+ in triplo
|
||||||
|
+ in voce
|
||||||
|
+ invite
|
||||||
|
+ ipso facto
|
||||||
|
+ jalousie de m<>tier
|
||||||
|
+ jehova
|
||||||
|
+ jeune premier
|
||||||
|
+ joint venture
|
||||||
|
+ jus d'orange
|
||||||
|
+ kalis
|
||||||
|
+ kousjer
|
||||||
|
+ laisser faire
|
||||||
|
+ laissez passer
|
||||||
|
+ lapis lazuli
|
||||||
|
+ latino
|
||||||
|
+ logos
|
||||||
|
+ ma<6D>tre d'h<>tel
|
||||||
|
+ minimal art
|
||||||
|
+ naar den vleze
|
||||||
|
+ non sequitur
|
||||||
|
+ off line
|
||||||
|
+ om den brode
|
||||||
|
+ on line
|
||||||
|
+ oratio pro domo
|
||||||
|
+ orchestreren
|
||||||
|
+ pain <20> la grecque
|
||||||
|
+ par excellence
|
||||||
|
+ pas de deux
|
||||||
|
+ paso doble
|
||||||
|
+ patates frites
|
||||||
|
+ peau de p<>che
|
||||||
|
+ perpetuum mobile
|
||||||
|
+ plat du jour
|
||||||
|
+ pool
|
||||||
|
+ poste restante
|
||||||
|
+ pot au feu
|
||||||
|
+ procesverbaal
|
||||||
|
+ promilitair
|
||||||
|
+ public relations
|
||||||
|
+ pur sang
|
||||||
|
+ qualitate qua
|
||||||
|
+ questionnaire
|
||||||
|
+ rector magnificus
|
||||||
|
+ remedial teacher
|
||||||
|
+ remedial teaching
|
||||||
|
+ rigor mortis
|
||||||
|
+ romein
|
||||||
|
+ self-fulfilling prophecy
|
||||||
|
+ septic tank
|
||||||
|
+ short story
|
||||||
|
+ sotto voce
|
||||||
|
+ stehgeiger
|
||||||
|
+ sub rosa
|
||||||
|
+ sur place
|
||||||
|
+ t-bonesteak
|
||||||
|
+ te bestemder plaatse
|
||||||
|
+ te bestemder tijd
|
||||||
|
+ te elfder ure
|
||||||
|
+ te eniger tijd
|
||||||
|
+ te gelde maken
|
||||||
|
+ te onzen voordele
|
||||||
|
+ ten algemenen nutte
|
||||||
|
+ ten anderen male
|
||||||
|
+ ten besluite
|
||||||
|
+ ten bewijze
|
||||||
|
+ ten derde male
|
||||||
|
+ ten geschenke geven
|
||||||
|
+ ten geschenke krijgen
|
||||||
|
+ ten tweede male
|
||||||
|
+ ten vervolge op
|
||||||
|
+ ter aangehaalder plaatse
|
||||||
|
+ ter bestemder plaatse
|
||||||
|
+ ter bestemder tijd
|
||||||
|
+ ter beurze
|
||||||
|
+ ter eenre zijde
|
||||||
|
+ ter elfder ure
|
||||||
|
+ ter kerke
|
||||||
|
+ ter ore
|
||||||
|
+ terneerliggen
|
||||||
|
+ terneerslaan
|
||||||
|
+ terneervallen
|
||||||
|
+ tertiair
|
||||||
|
+ top secret
|
||||||
|
+ tot bloedens toe
|
||||||
|
+ total loss
|
||||||
|
+ turken
|
||||||
|
+ upper ten
|
||||||
|
+ ups and downs
|
||||||
|
+ van koninklijken bloede
|
||||||
|
+ van zinnens zijn
|
||||||
|
+ viola da gamba
|
||||||
|
+ white spirit
|
||||||
|
+ wishful thinking
|
||||||
|
+ <20> gogo
|
||||||
|
+ <20> propos
|
||||||
|
|||||||
@@ -1,10 +1,31 @@
|
|||||||
*** pl_PL.orig.aff Wed Mar 30 06:50:02 2005
|
*** pl_PL.orig.aff Wed Mar 30 06:50:02 2005
|
||||||
--- pl_PL.aff Sat Apr 23 20:11:15 2005
|
--- pl_PL.aff Sat Jun 18 19:45:45 2005
|
||||||
***************
|
***************
|
||||||
*** 3,4 ****
|
*** 3,4 ****
|
||||||
--- 3,7 ----
|
--- 3,7 ----
|
||||||
|
|
||||||
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 6614 ****
|
||||||
|
--- 6617,6634 ----
|
||||||
|
SFX y y ie jmy
|
||||||
|
+
|
||||||
|
+ # REP entries proposed by Mikolaj Machowski:
|
||||||
|
+ REP 14
|
||||||
|
+ REP b p
|
||||||
|
+ REP p b
|
||||||
|
+ REP <20> rz
|
||||||
|
+ REP rz <20>
|
||||||
|
+ REP w f
|
||||||
|
+ REP f w
|
||||||
|
+ REP <20> u
|
||||||
|
+ REP u <20>
|
||||||
|
+ REP ci <20>
|
||||||
|
+ REP <20> ci
|
||||||
|
+ REP si <20>
|
||||||
|
+ REP <20> si
|
||||||
|
+ REP ni <20>
|
||||||
|
+ REP <20> ni
|
||||||
|
|||||||
@@ -1957,7 +1957,7 @@ struct VimMenu
|
|||||||
char_u *actext; /* accelerator text (after TAB) */
|
char_u *actext; /* accelerator text (after TAB) */
|
||||||
int priority; /* Menu order priority */
|
int priority; /* Menu order priority */
|
||||||
#ifdef FEAT_GUI
|
#ifdef FEAT_GUI
|
||||||
void (*cb)(); /* Call-back routine */
|
void (*cb) __ARGS((vimmenu_T *)); /* Call-back routine */
|
||||||
#endif
|
#endif
|
||||||
#ifdef FEAT_TOOLBAR
|
#ifdef FEAT_TOOLBAR
|
||||||
char_u *iconfile; /* name of file for icon or NULL */
|
char_u *iconfile; /* name of file for icon or NULL */
|
||||||
|
|||||||
28
src/term.c
28
src/term.c
@@ -814,16 +814,16 @@ static struct builtin_term builtin_termcaps[] =
|
|||||||
{(int)KS_CCO, "8"}, /* allow 8 colors */
|
{(int)KS_CCO, "8"}, /* allow 8 colors */
|
||||||
{(int)KS_ME, IF_EB("\033[0m", ESC_STR "[0m")},
|
{(int)KS_ME, IF_EB("\033[0m", ESC_STR "[0m")},
|
||||||
{(int)KS_MR, IF_EB("\033[7m", ESC_STR "[7m")},
|
{(int)KS_MR, IF_EB("\033[7m", ESC_STR "[7m")},
|
||||||
{(int)KS_MD, IF_EB("\033[1m", ESC_STR "[1m")}, /* bold mode */
|
{(int)KS_MD, IF_EB("\033[1m", ESC_STR "[1m")}, /* bold mode */
|
||||||
{(int)KS_SE, IF_EB("\033[22m", ESC_STR "[22m")},/* normal mode */
|
{(int)KS_SE, IF_EB("\033[22m", ESC_STR "[22m")},/* normal mode */
|
||||||
{(int)KS_UE, IF_EB("\033[24m", ESC_STR "[24m")},/* exit underscore mode */
|
{(int)KS_UE, IF_EB("\033[24m", ESC_STR "[24m")},/* exit underscore mode */
|
||||||
{(int)KS_US, IF_EB("\033[4m", ESC_STR "[4m")}, /* underscore mode */
|
{(int)KS_US, IF_EB("\033[4m", ESC_STR "[4m")}, /* underscore mode */
|
||||||
{(int)KS_CZH, IF_EB("\033[34;43m", ESC_STR "[34;43m" )}, /* italic mode: blue text on yellow */
|
{(int)KS_CZH, IF_EB("\033[34;43m", ESC_STR "[34;43m")}, /* italic mode: blue text on yellow */
|
||||||
{(int)KS_CZR, IF_EB("\033[0m", ESC_STR "[0m")}, /* italic mode end */
|
{(int)KS_CZR, IF_EB("\033[0m", ESC_STR "[0m")}, /* italic mode end */
|
||||||
{(int)KS_CAB, IF_EB("\033[4%dm", ESC_STR "[4%dm" )}, /* set background color (ANSI) */
|
{(int)KS_CAB, IF_EB("\033[4%dm", ESC_STR "[4%dm")}, /* set background color (ANSI) */
|
||||||
{(int)KS_CAF, IF_EB("\033[3%dm", ESC_STR "[3%dm" )}, /* set foreground color (ANSI) */
|
{(int)KS_CAF, IF_EB("\033[3%dm", ESC_STR "[3%dm")}, /* set foreground color (ANSI) */
|
||||||
{(int)KS_CSB, IF_EB("\033[102;%dm", ESC_STR "[102;%dm" )}, /* set screen background color */
|
{(int)KS_CSB, IF_EB("\033[102;%dm", ESC_STR "[102;%dm")}, /* set screen background color */
|
||||||
{(int)KS_CSF, IF_EB("\033[101;%dm", ESC_STR "[101;%dm" )}, /* set screen foreground color */
|
{(int)KS_CSF, IF_EB("\033[101;%dm", ESC_STR "[101;%dm")}, /* set screen foreground color */
|
||||||
{(int)KS_MS, "y"},
|
{(int)KS_MS, "y"},
|
||||||
{(int)KS_UT, "y"},
|
{(int)KS_UT, "y"},
|
||||||
{(int)KS_LE, "\b"},
|
{(int)KS_LE, "\b"},
|
||||||
@@ -842,13 +842,17 @@ static struct builtin_term builtin_termcaps[] =
|
|||||||
{K_DOWN, IF_EB("\033[B", ESC_STR "[B")},
|
{K_DOWN, IF_EB("\033[B", ESC_STR "[B")},
|
||||||
{K_RIGHT, IF_EB("\033[C", ESC_STR "[C")},
|
{K_RIGHT, IF_EB("\033[C", ESC_STR "[C")},
|
||||||
{K_LEFT, IF_EB("\033[D", ESC_STR "[D")},
|
{K_LEFT, IF_EB("\033[D", ESC_STR "[D")},
|
||||||
|
{K_F1, IF_EB("\033[11~", ESC_STR "[11~")},
|
||||||
|
{K_F2, IF_EB("\033[12~", ESC_STR "[12~")},
|
||||||
|
{K_F3, IF_EB("\033[13~", ESC_STR "[13~")},
|
||||||
|
{K_F4, IF_EB("\033[14~", ESC_STR "[14~")},
|
||||||
|
{K_F5, IF_EB("\033[15~", ESC_STR "[15~")},
|
||||||
{K_F6, IF_EB("\033[17~", ESC_STR "[17~")},
|
{K_F6, IF_EB("\033[17~", ESC_STR "[17~")},
|
||||||
{K_F7, IF_EB("\033[18~", ESC_STR "[18~")},
|
{K_F7, IF_EB("\033[18~", ESC_STR "[18~")},
|
||||||
{K_F8, IF_EB("\033[19~", ESC_STR "[19~")},
|
{K_F8, IF_EB("\033[19~", ESC_STR "[19~")},
|
||||||
{K_F9, IF_EB("\033[20~", ESC_STR "[20~")},
|
{K_F9, IF_EB("\033[20~", ESC_STR "[20~")},
|
||||||
{K_F10, IF_EB("\033[21~", ESC_STR "[21~")},
|
{K_F10, IF_EB("\033[21~", ESC_STR "[21~")},
|
||||||
/* {K_F11, IF_EB("\033[23~", ESC_STR "[23~")},
|
{K_F11, IF_EB("\033[23~", ESC_STR "[23~")},
|
||||||
* (ESC) should not define, sometimes does not work */
|
|
||||||
{K_F12, IF_EB("\033[24~", ESC_STR "[24~")},
|
{K_F12, IF_EB("\033[24~", ESC_STR "[24~")},
|
||||||
{K_F13, IF_EB("\033[25~", ESC_STR "[25~")},
|
{K_F13, IF_EB("\033[25~", ESC_STR "[25~")},
|
||||||
{K_F14, IF_EB("\033[26~", ESC_STR "[26~")},
|
{K_F14, IF_EB("\033[26~", ESC_STR "[26~")},
|
||||||
|
|||||||
@@ -79,7 +79,8 @@ static long u_newcount, u_oldcount;
|
|||||||
static int undo_undoes = FALSE;
|
static int undo_undoes = FALSE;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* save the current line for both the "u" and "U" command
|
* Save the current line for both the "u" and "U" command.
|
||||||
|
* Returns OK or FAIL.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
u_save_cursor()
|
u_save_cursor()
|
||||||
|
|||||||
@@ -36,5 +36,5 @@
|
|||||||
#define VIM_VERSION_NODOT "vim70aa"
|
#define VIM_VERSION_NODOT "vim70aa"
|
||||||
#define VIM_VERSION_SHORT "7.0aa"
|
#define VIM_VERSION_SHORT "7.0aa"
|
||||||
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
|
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
|
||||||
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 19)"
|
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 22)"
|
||||||
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 19, compiled "
|
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 22, compiled "
|
||||||
|
|||||||
31
src/window.c
31
src/window.c
@@ -458,11 +458,8 @@ do_window(nchar, Prenum, xchar)
|
|||||||
case 'f':
|
case 'f':
|
||||||
case Ctrl_F:
|
case Ctrl_F:
|
||||||
CHECK_CMDWIN
|
CHECK_CMDWIN
|
||||||
#ifdef FEAT_VISUAL
|
|
||||||
reset_VIsual_and_resel(); /* stop Visual mode */
|
ptr = grab_file_name(Prenum1);
|
||||||
#endif
|
|
||||||
ptr = file_name_at_cursor(FNAME_MESS|FNAME_HYP|FNAME_EXP,
|
|
||||||
Prenum1);
|
|
||||||
if (ptr != NULL)
|
if (ptr != NULL)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_GUI
|
#ifdef FEAT_GUI
|
||||||
@@ -4477,6 +4474,30 @@ last_status_rec(fr, statusline)
|
|||||||
#endif /* FEAT_WINDOWS */
|
#endif /* FEAT_WINDOWS */
|
||||||
|
|
||||||
#if defined(FEAT_SEARCHPATH) || defined(PROTO)
|
#if defined(FEAT_SEARCHPATH) || defined(PROTO)
|
||||||
|
/*
|
||||||
|
* Get the file name at the cursor.
|
||||||
|
* If Visual mode is active, use the selected text if it's in one line.
|
||||||
|
* Returns the name in allocated memory, NULL for failure.
|
||||||
|
*/
|
||||||
|
char_u *
|
||||||
|
grab_file_name(count)
|
||||||
|
long count;
|
||||||
|
{
|
||||||
|
# ifdef FEAT_VISUAL
|
||||||
|
if (VIsual_active)
|
||||||
|
{
|
||||||
|
int len;
|
||||||
|
char_u *ptr;
|
||||||
|
|
||||||
|
if (get_visual_text(NULL, &ptr, &len) == FAIL)
|
||||||
|
return NULL;
|
||||||
|
return find_file_name_in_path(ptr, len,
|
||||||
|
FNAME_MESS|FNAME_EXP|FNAME_REL, count, curbuf->b_ffname);
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
return file_name_at_cursor(FNAME_MESS|FNAME_HYP|FNAME_EXP|FNAME_REL, count);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Return the file name under or after the cursor.
|
* Return the file name under or after the cursor.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user