From e344bead3ecc16a0982d157e8c19050f6dff4e0c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 1 Sep 2005 20:46:49 +0000 Subject: updated for version 7.0140 --- runtime/autoload/ccomplete.vim | 32 +++ runtime/doc/Makefile | 2 + runtime/doc/debug.txt | 69 ++++++ runtime/doc/develop.txt | 6 +- runtime/doc/eval.txt | 10 +- runtime/doc/help.txt | 3 +- runtime/doc/if_ruby.txt | 4 +- runtime/doc/insert.txt | 11 +- runtime/doc/intro.txt | 28 +-- runtime/doc/map.txt | 10 + runtime/doc/options.txt | 60 ++++-- runtime/doc/quickfix.txt | 14 +- runtime/doc/quickref.txt | 3 +- runtime/doc/tags | 8 +- runtime/doc/todo.txt | 43 ++-- runtime/doc/various.txt | 10 +- runtime/doc/version7.txt | 11 +- runtime/ftplugin/c.vim | 9 +- runtime/lang/menu_it_it.latin1.vim | 24 ++- runtime/optwin.vim | 5 +- runtime/spell/cy/cy_GB.diff | 9 + runtime/spell/cy/main.aap | 82 +++++++ runtime/spell/da/main.aap | 1 + runtime/spell/en.ascii.spl | Bin 566616 -> 566617 bytes runtime/spell/en.latin1.spl | Bin 568720 -> 568721 bytes runtime/spell/en.utf-8.spl | Bin 569151 -> 569152 bytes runtime/spell/fo/main.aap | 1 + runtime/spell/fr/main.aap | 4 +- runtime/spell/ga/ga_IE.diff | 27 +++ runtime/spell/ga/main.aap | 79 +++++++ runtime/spell/gd/gd_GB.diff | 26 +++ runtime/spell/gd/main.aap | 78 +++++++ runtime/spell/hr/main.aap | 4 +- runtime/spell/id/id_ID.diff | 22 ++ runtime/spell/id/main.aap | 79 +++++++ runtime/spell/it/main.aap | 5 +- runtime/spell/ku/ku_TR.diff | 0 runtime/spell/ku/main.aap | 82 +++++++ runtime/spell/la/la.diff | 12 ++ runtime/spell/la/main.aap | 78 +++++++ runtime/spell/lt/lt_LT.diff | 0 runtime/spell/lt/main.aap | 78 +++++++ runtime/spell/lv/main.aap | 83 +++++++ runtime/spell/main.aap | 7 +- runtime/spell/mg/main.aap | 79 +++++++ runtime/spell/mg/mg_MG.diff | 26 +++ runtime/spell/mi/main.aap | 80 +++++++ runtime/spell/mi/mi_NZ.diff | 10 + runtime/spell/ms/main.aap | 81 +++++++ runtime/spell/ms/ms_MY.diff | 24 +++ runtime/spell/nb/main.aap | 78 +++++++ runtime/spell/nb/nb_NO.diff | 63 ++++++ runtime/spell/nn/main.aap | 78 +++++++ runtime/spell/nn/nn_NO.diff | 25 +++ runtime/spell/pt/main.aap | 123 +++++++++++ runtime/spell/pt/pt_BR.diff | 46 ++++ runtime/spell/pt/pt_PT.diff | 27 +++ runtime/spell/ro/main.aap | 81 +++++++ runtime/spell/ro/ro_RO.diff | 42 ++++ runtime/spell/rw/main.aap | 79 +++++++ runtime/spell/rw/rw_RW.diff | 13 ++ runtime/spell/sl/main.aap | 81 +++++++ runtime/spell/sl/sl_SI.diff | 11 + runtime/spell/sv/main.aap | 79 +++++++ runtime/spell/sv/sv_SE.diff | 40 ++++ runtime/spell/sw/main.aap | 79 +++++++ runtime/spell/sw/sw_KE.diff | 13 ++ runtime/spell/tl/main.aap | 78 +++++++ runtime/spell/tl/tl_PH.diff | 18 ++ runtime/spell/tn/main.aap | 82 +++++++ runtime/spell/tn/tn_ZA.diff | 10 + runtime/spell/uk/main.aap | 57 +++++ runtime/spell/uk/uk_UA.diff | 17 ++ runtime/spell/yi/!yi.diff | 8 - runtime/spell/yi/!yi_tr.diff | 8 - runtime/spell/zu/main.aap | 83 +++++++ runtime/spell/zu/zu_ZA.diff | 8 + runtime/syntax/cf.vim | 236 +++++++++++--------- runtime/syntax/help.vim | 4 +- src/Makefile | 39 +++- src/auto/configure | 13 +- src/buffer.c | 1 + src/configure.in | 12 +- src/edit.c | 111 ++++------ src/ex_getln.c | 3 +- src/gui_mac.c | 21 +- src/gui_w48.c | 1 + src/if_mzsch.c | 36 ++-- src/if_perl.xs | 75 ++++--- src/if_python.c | 36 ++-- src/if_ruby.c | 34 +-- src/if_tcl.c | 30 +-- src/if_xcmdsrv.c | 2 +- src/mbyte.c | 4 - src/option.c | 14 ++ src/po/it.po | 430 ++++++++++++++++++++++--------------- src/proto/gui_w32.pro | 2 +- src/proto/search.pro | 2 +- src/quickfix.c | 29 ++- src/spell.c | 2 +- src/structs.h | 26 +-- src/version.h | 4 +- src/vim.h | 4 + 103 files changed, 3276 insertions(+), 641 deletions(-) create mode 100644 runtime/autoload/ccomplete.vim create mode 100644 runtime/doc/debug.txt create mode 100644 runtime/spell/cy/cy_GB.diff create mode 100644 runtime/spell/cy/main.aap create mode 100644 runtime/spell/ga/ga_IE.diff create mode 100644 runtime/spell/ga/main.aap create mode 100644 runtime/spell/gd/gd_GB.diff create mode 100644 runtime/spell/gd/main.aap create mode 100644 runtime/spell/id/id_ID.diff create mode 100644 runtime/spell/id/main.aap create mode 100644 runtime/spell/ku/ku_TR.diff create mode 100644 runtime/spell/ku/main.aap create mode 100644 runtime/spell/la/la.diff create mode 100644 runtime/spell/la/main.aap create mode 100644 runtime/spell/lt/lt_LT.diff create mode 100644 runtime/spell/lt/main.aap create mode 100644 runtime/spell/lv/main.aap create mode 100644 runtime/spell/mg/main.aap create mode 100644 runtime/spell/mg/mg_MG.diff create mode 100644 runtime/spell/mi/main.aap create mode 100644 runtime/spell/mi/mi_NZ.diff create mode 100644 runtime/spell/ms/main.aap create mode 100644 runtime/spell/ms/ms_MY.diff create mode 100644 runtime/spell/nb/main.aap create mode 100644 runtime/spell/nb/nb_NO.diff create mode 100644 runtime/spell/nn/main.aap create mode 100644 runtime/spell/nn/nn_NO.diff create mode 100644 runtime/spell/pt/main.aap create mode 100644 runtime/spell/pt/pt_BR.diff create mode 100644 runtime/spell/pt/pt_PT.diff create mode 100644 runtime/spell/ro/main.aap create mode 100644 runtime/spell/ro/ro_RO.diff create mode 100644 runtime/spell/rw/main.aap create mode 100644 runtime/spell/rw/rw_RW.diff create mode 100644 runtime/spell/sl/main.aap create mode 100644 runtime/spell/sl/sl_SI.diff create mode 100644 runtime/spell/sv/main.aap create mode 100644 runtime/spell/sv/sv_SE.diff create mode 100644 runtime/spell/sw/main.aap create mode 100644 runtime/spell/sw/sw_KE.diff create mode 100644 runtime/spell/tl/main.aap create mode 100644 runtime/spell/tl/tl_PH.diff create mode 100644 runtime/spell/tn/main.aap create mode 100644 runtime/spell/tn/tn_ZA.diff create mode 100644 runtime/spell/uk/main.aap create mode 100644 runtime/spell/uk/uk_UA.diff delete mode 100644 runtime/spell/yi/!yi.diff delete mode 100644 runtime/spell/yi/!yi_tr.diff create mode 100644 runtime/spell/zu/main.aap create mode 100644 runtime/spell/zu/zu_ZA.diff diff --git a/runtime/autoload/ccomplete.vim b/runtime/autoload/ccomplete.vim new file mode 100644 index 0000000000..f699ca7582 --- /dev/null +++ b/runtime/autoload/ccomplete.vim @@ -0,0 +1,32 @@ +" Vim completion script +" Language: C +" Maintainer: Bram Moolenaar +" Last Change: 2005 Sep 01 + +function! ccomplete#Complete(findstart, base) + if a:findstart + " locate the start of the word + let line = getline('.') + let start = col('.') - 1 + while start > 0 + if line[start - 1] =~ '\w\|\.' + let start -= 1 + elseif start > 1 && line[start - 2] == '-' && line[start - 1] == '>' + let start -= 2 + else + break + endif + endwhile + return start + endif + + " return list of matches + let items = split(a:base, '\.\|->') + if len(items) == 1 + " Only one part, no "." or "->": complete from tags file. + let diclist = taglist(items[0]) + return map(diclist, 'v:val["name"]') + endif + return items +endfunction + diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 3aef1ca97c..a5770c2b28 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -19,6 +19,7 @@ DOCS = \ change.txt \ cmdline.txt \ debugger.txt \ + debug.txt \ develop.txt \ diff.txt \ digraph.txt \ @@ -139,6 +140,7 @@ HTMLS = \ autocmd.html \ change.html \ cmdline.html \ + debug.html \ debugger.html \ develop.html \ diff.html \ diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt new file mode 100644 index 0000000000..a0fef1b646 --- /dev/null +++ b/runtime/doc/debug.txt @@ -0,0 +1,69 @@ +*debug.txt* For Vim version 7.0aa. Last change: 2005 Sep 01 + + + VIM REFERENCE MANUAL by Bram Moolenaar + + +Debugging Vim *debug-vim* + +This is for debugging Vim itself, when it doesn't work properly. + +1. Location of a crash, using gcc and gdb |debug-gcc| +2. Windows Bug Reporting |debug-win32| + +============================================================================== + +1. Location of a crash, using gcc and gdb *debug-gcc* + +When Vim crashes in one of the test files, and you are using gcc for +compilation, here is what you can do to find out exactly where Vim crashes. +This also applies when using the MingW tools. + +1. Compile Vim with the "-g" option (there is a line in the Makefile for this, + which you can uncomment). + +2. Execute these commands (replace "11" with the test that fails): > + cd testdir + gdb ../vim + run -u unix.vim -U NONE -s dotest.in test11.in + +3. Check where Vim crashes, gdb should give a message for this. + +4. Get a stack trace from gdb with this command: > + where +< You can check out different places in the stack trace with: > + frame 3 +< Replace "3" with one of the numbers in the stack trace. + +============================================================================== + +2. Windows Bug Reporting *debug-win32* + +If the Windows version of Vim crashes in a reproducible manner, +you can take some steps to provide a useful bug report. + +First, you must obtain the debugger symbols (PDB) file for your executable: +gvim.pdb for gvim.exe, or vim.pdb for vim.exe. It should be available +from the same place that you obtained the executable. Be sure to use +the PDB that matches the EXE. + +If you built the executable yourself with the Microsoft Visual C++ compiler, +then the PDB was built with the EXE. + +You can download the Microsoft Visual C++ Toolkit from + http://msdn.microsoft.com/visualc/vctoolkit2003/ +This contains the command-line tools, but not the Visual Studio IDE. + +The Debugging Tools for Windows can be downloaded from + http://www.microsoft.com/whdc/devtools/debugging/default.mspx +This includes the WinDbg debugger. + +If you have Visual Studio, use that instead of the VC Toolkit +and WinDbg. + + +(No idea what to do if your binary was built with the Borland or Cygwin +compilers. Sorry.) + +========================================================================= + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index a640f5b3be..498833c5a7 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 7.0aa. Last change: 2005 Aug 14 +*develop.txt* For Vim version 7.0aa. Last change: 2005 Sep 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -238,8 +238,8 @@ get_env_value() Linux system function VARIOUS *style-various* -Typedef'ed names should end in "_t": > - typedef int some_t; +Typedef'ed names should end in "_T": > + typedef int some_T; Define'ed names should be uppercase: > #define SOME_THING Features always start with "FEAT_": > diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index b412734e6f..bc03f03aae 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0aa. Last change: 2005 Aug 23 +*eval.txt* For Vim version 7.0aa. Last change: 2005 Aug 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4081,12 +4081,12 @@ string({expr}) Return {expr} converted to a String. If {expr} is a Number, *strlen()* strlen({expr}) The result is a Number, which is the length of the String - {expr} in bytes. If you want to count the number of - multi-byte characters use something like this: > + {expr} in bytes. + If you want to count the number of multi-byte characters (not + counting composing characters) use something like this: > :let len = strlen(substitute(str, ".", "x", "g")) - -< Composing characters are not counted. +< If the argument is a Number it is first converted to a String. For other types an error is given. Also see |len()|. diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index 2007a8af81..5fa8cf1e4a 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 7.0aa. Last change: 2005 Mar 19 +*help.txt* For Vim version 7.0aa. Last change: 2005 Sep 01 VIM - main help file k @@ -97,6 +97,7 @@ General subjects ~ |quotes.txt| remarks from users of Vim |todo.txt| known problems and desired extensions |develop.txt| development of Vim +|debug.txt| debugging Vim itself |uganda.txt| Vim distribution conditions and what to do with your money Basic editing ~ diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt index 3ca8cc510b..1efb6ce785 100644 --- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -1,4 +1,4 @@ -*if_ruby.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*if_ruby.txt* For Vim version 7.0aa. Last change: 2005 Aug 31 VIM REFERENCE MANUAL by Shugo Maeda @@ -159,6 +159,8 @@ Methods: buffer Returns the buffer displayed in the window. height Returns the height of the window. height = {n} Sets the window height to {n}. +width Returns the width of the window. +width = {n} Sets the window width to {n}. cursor Returns a [row, col] array for the cursor position. cursor = [{row}, {col}] Sets the cursor position to {row} and {col}. diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index ae90eb954c..6530d9ebfc 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.0aa. Last change: 2005 Aug 17 +*insert.txt* For Vim version 7.0aa. Last change: 2005 Sep 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -868,8 +868,8 @@ CTRL-X CTRL-V Guess what kind of item is in front of the cursor and User defined completion *compl-function* Completion is done by a function that can be defined by the user with the -'completefunc' option. See the option for how the function is called and an -example. +'completefunc' option. See the 'completefunc' help for how the function +is called and an example. *i_CTRL-X_CTRL-U* CTRL-X CTRL-U Guess what kind of item is in front of the cursor and @@ -884,7 +884,10 @@ CTRL-X CTRL-U Guess what kind of item is in front of the cursor and Occult completion *compl-occult* -Completion is done by a supernatural being. +Completion is done by a function that can be defined by the user with the +'occultfunc' option. This is to be used for filetype-specific completion. + +See the 'completefunc' help for how the function is called and an example. *i_CTRL-X_CTRL-O* CTRL-X CTRL-O Guess what kind of item is in front of the cursor and diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 3f8e35d5b5..89f020c507 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 7.0aa. Last change: 2005 Jun 12 +*intro.txt* For Vim version 7.0aa. Last change: 2005 Sep 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -151,31 +151,19 @@ example and try to find out which settings or other things influence the appearance of the bug. Try different machines, if possible. Send me patches if you can! -In case of doubt, use: > +It will help to include information about the version of Vim you are using and +your setup. You can get the information with this command: > :so $VIMRUNTIME/bugreport.vim This will create a file "bugreport.txt" in the current directory, with a lot of information of your environment. Before sending this out, check if it doesn't contain any confidential information! - *debug-vim* -When Vim crashes in one of the test files, and you are using gcc for -compilation, here is what you can do to find out exactly where Vim crashes: +If Vim crashes, please try to find out where. You can find help on this here: +|debug.txt|. -1. Compile Vim with the "-g" option (there is a line in the Makefile for this, - which you can uncomment). - -2. Execute these commands (replace "11" with the test that fails): > - cd testdir - gdb ../vim - run -u unix.vim -U NONE -s dotest.in test11.in - -3. Check where Vim crashes, gdb should give a message for this. - -4. Get a stack trace from gdb with this command: > - where -< You can check out different places in the stack trace with: > - frame 3 -< Replace "3" with one of the numbers in the stack trace. +In case of doubt or when you wonder if the problem has already been fixed but +you can't find a fix for it, become a member of the vim-dev maillist and ask +your question there. |maillist| *year-2000* *Y2K* Since Vim internally doesn't use dates for editing, there is no year 2000 diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 5fb03e9165..c33023a75e 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -666,6 +666,16 @@ used in a |filetype-plugin| file. Example for a C plugin file: > mode, '!' for both. These are the same as for mappings, see |map-listing|. + *:abbreviate-verbose* +When 'verbose' is non-zero, listing an abbreviation will also display where it +was last defined. Example: > + + :verbose abbreviate + ! teh the + Last set from /home/abcd/vim/abbr.vim + +See |:verbose-cmd| for more information. + :ab[breviate] {lhs} list the abbreviations that start with {lhs} You may need to insert a CTRL-V (type it twice) to avoid that a typed {lhs} is expanded, since diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index eb5a34a4da..20d0e9f169 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2005 Aug 27 +*options.txt* For Vim version 7.0aa. Last change: 2005 Sep 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1591,23 +1591,29 @@ A jump table for the options with a short description can be found at |Q_op|. This option specifies a function to be used for CTRL-X CTRL-U completion. |i_CTRL-X_CTRL-U| - The function will be invoked with three arguments: - a:findstart either 1 or 0 - a:col column in the cursor line where the completion ends, - first column is zero - a:base the text with which matches should match + The function will be invoked with two arguments. First the function + is called to find the start of the text to be completed. Secondly the + function is called to actually find the matches. - When the a:findstart argument is 1, the function must return the - column of where the completion starts. It must be a number between - zero and "a:col". This involves looking at the characters in the - cursor line before column a:col and include those characters that - could be part of the completed item. The text between this column and - a:col will be replaced with the matches. Return -1 if no completion - can be done. + On the first invocation the arguments are: + a:findstart 1 + a:base empty - When the a:findstart argument is 0 the function must return a List - with the matching words. These matches should include the "a:base" - text. When there are no matches return an empty List. + The function must return the column of where the completion starts. + It must be a number between zero and the cursor column "col('.')". + This involves looking at the characters just before the cursor and + including those characters that could be part of the completed item. + The text between this column and the cursor column will be replaced + with the matches. Return -1 if no completion can be done. + + On the second invocation the arguments are: + a:findstart 0 + a:base the text with which matches should match, what was + located in the first call + + The function must return a List with the matching words. These + matches usually include the "a:base" text. When there are no matches + return an empty List. When searching for matches takes some time call |complete_add()| to add each match to the total list. These matches should then not @@ -1615,16 +1621,16 @@ A jump table for the options with a short description can be found at |Q_op|. allow the user to press a key while still searching for matches. Stop searching when it returns non-zero. - The function must not move the cursor! + The function may move the cursor, it is restored afterwards. This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. An example that completes the names of the months: > - fun! CompleteMonths(findstart, col, base) + fun! CompleteMonths(findstart, base) if a:findstart " locate the start of the word let line = getline('.') - let start = a:col + let start = col('.') - 1 while start > 0 && line[start - 1] =~ '\a' let start -= 1 endwhile @@ -1643,11 +1649,11 @@ A jump table for the options with a short description can be found at |Q_op|. set completefunc=CompleteMonths < The same, but now pretending searching for matches is slow: > - fun! CompleteMonths(findstart, col, base) + fun! CompleteMonths(findstart, base) if a:findstart " locate the start of the word let line = getline('.') - let start = a:col + let start = col('.') - 1 while start > 0 && line[start - 1] =~ '\a' let start -= 1 endwhile @@ -4588,6 +4594,18 @@ A jump table for the options with a short description can be found at |Q_op|. The minimum value is 1, the maximum value is 10. NOTE: 'numberwidth' is reset to 8 when 'compatible' is set. + *'occultfunc'* *'ofu'* +'occultfunc' 'ofu' string (default: empty) + local to buffer + {not in Vi} + {not available when compiled without the +eval + or +insert_expand feature} + This option specifies a function to be used for CTRL-X CTRL-O + completion. |i_CTRL-X_CTRL-O| + + For the use of the function see 'completefunc'. + + *'osfiletype'* *'oft'* *E366* 'osfiletype' 'oft' string (RISC-OS default: "Text", others default: "") diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 313b218a7b..2a148bd473 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.0aa. Last change: 2005 Jul 27 +*quickfix.txt* For Vim version 7.0aa. Last change: 2005 Aug 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -631,15 +631,13 @@ Basic items %% the single '%' character %s search text (finds a string) -The "%f" conversion depends on the current 'isfname' setting. "~/" is +The "%f" conversion may depend on the current 'isfname' setting. "~/" is expanded to the home directory and environment variables are expanded. -The "%f" and "%m" conversions have to detect the end of the string. They -should be followed by a character that cannot be in the string. Everything -up to that character is included in the string. But when the next character -is a '%' or a backslash, "%f" will look for any 'isfname' character and "%m" -finds anything. If the "%f" or "%m" is at the end, everything up to the end -of the line is included. +The "%f" and "%m" conversions have to detect the end of the string. This +normally happens by matching following characters and items. When nohting is +following the rest of the line is matched. If "%f" is followed by a '%' or a +backslash, it will look for a sequence of 'isfname' characters. On MS-DOS, MS-Windows and OS/2 a leading "C:" will be included in "%f", even when using "%f:". This means that a file name which is a single alphabetical diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index d2e07e5108..c8597a6d59 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.0aa. Last change: 2005 Aug 29 +*quickref.txt* For Vim version 7.0aa. Last change: 2005 Sep 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -772,6 +772,7 @@ Short explanation of each option: *option-list* |'nrformats'| |'nf'| number formats recognized for CTRL-A command |'number'| |'nu'| print the line number in front of each line |'numberwidth'| |'nuw'| number of columns used for the line number +|'occultfunc'| |'ofu'| function for filetype-specific completion |'osfiletype'| |'oft'| operating system-specific filetype information |'paragraphs'| |'para'| nroff macros that separate paragraphs |'paste'| allow pasting text diff --git a/runtime/doc/tags b/runtime/doc/tags index ef72d3cb8a..870b7bb4ee 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -607,7 +607,9 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'number' options.txt /*'number'* 'numberwidth' options.txt /*'numberwidth'* 'nuw' options.txt /*'nuw'* +'occultfunc' options.txt /*'occultfunc'* 'oft' options.txt /*'oft'* +'ofu' options.txt /*'ofu'* 'op' vi_diff.txt /*'op'* 'open' vi_diff.txt /*'open'* 'optimize' vi_diff.txt /*'optimize'* @@ -1669,6 +1671,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :abbreviate map.txt /*:abbreviate* :abbreviate- map.txt /*:abbreviate-* :abbreviate-local map.txt /*:abbreviate-local* +:abbreviate-verbose map.txt /*:abbreviate-verbose* :abc map.txt /*:abc* :abclear map.txt /*:abclear* :abo windows.txt /*:abo* @@ -4609,11 +4612,14 @@ das motion.txt /*das* dav pi_netrw.txt /*dav* daw motion.txt /*daw* dd change.txt /*dd* +debug-gcc debug.txt /*debug-gcc* debug-highlight debugger.txt /*debug-highlight* debug-mode repeat.txt /*debug-mode* debug-scripts repeat.txt /*debug-scripts* debug-signs debugger.txt /*debug-signs* -debug-vim intro.txt /*debug-vim* +debug-vim debug.txt /*debug-vim* +debug-win32 debug.txt /*debug-win32* +debug.txt debug.txt /*debug.txt* debugger-compilation debugger.txt /*debugger-compilation* debugger-features debugger.txt /*debugger-features* debugger-integration debugger.txt /*debugger-integration* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 6e6381341a..dfdf097de9 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2005 Aug 30 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Sep 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,16 +30,7 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Mac: -- strings.h is bogus, add configure check. -- GUI: pasting lines results in ^M instead of line breaks. (Benjamin Esham) -- "cp -R ../runtime appdir" may copy way too much. - -cmdline_at_end() and cmdline_overstrike() may not be used. - -Ruby: documentation for window width (Wind) - -Add a few more languages for spell checking. +Try out using the free MS compiler and debugger, using Make_mvc.mak. Mac unicode patch (Da Woon Jung): - selecting proportional font breaks display @@ -71,13 +62,12 @@ PLANNED FOR VERSION 7.0: that make sense. Esp. members of classes/structs. It's not much different from other Insert-mode completion, use the same - mechanism. Use CTRL-X CTRL-O. + mechanism. Use CTRL-X CTRL-O and 'occultfunc'. Set 'occultfunc' in the + filetype plugin, define the function in the autoload directory. Separately develop the completion logic and the UI. When adding UI stuff make it work for all completion methods. - First cleanup the Insert-mode completion. - UI: - At first: use 'wildmenu' kind of thing. - Nicer: Display the list of choices right under the place where they @@ -85,9 +75,22 @@ PLANNED FOR VERSION 7.0: alternatives). Completion logic: - Use something like 'completefunc'? - runtime/complete/{filetype}.vim files? + Use runtime/autoload/{filetype}complete.vim files. + + For a simple name can complete like with CTRL-N. + get list of IDs from the tagfile? + For struct or class add "." or "->"? + + After a reference to a struct or class suggest members. + Recognizing "var.mem" and 'var->mem" is easy. + How to get the type of "var"? + tags file doesn't give type of typedef! E.g., oparg_T is + listed with "^} oparg_T;$" + How to get the members of that type? + tags file has struct: and class: fields + In function arguments suggest variables of expected type. + List of completions is a Dictionary with items: complist[0]['text'] = completion text complist[0]['type'] = type of completion (e.g. function, var, arg) @@ -98,11 +101,15 @@ PLANNED FOR VERSION 7.0: Ideas from others: http://www.vim.org/scripts/script.php?script_id=747 http://sourceforge.net/projects/insenvim - of http://insenvim.sourceforge.net + or http://insenvim.sourceforge.net Java, XML, HTML, C++, JSP, SQL, C# MS-Windows only, lots of dependencies (e.g. Perl, Internet explorer), uses .dll shared libraries. - for C++ uses $INCLUDE environment var + For C++ uses $INCLUDE environment var. + Uses Perl for C++. + Uses ctags to find the info: + ctags -f $allTagsFile --fields=+aiKmnsSz --language-force=C++ --C++-kinds=+cefgmnpsut-dlux -u $files + UI: popup menu with list of alternatives, icon to indicate type optional popup window with info about selected alternative Unrelated settings are changed (e.g. 'mousemodel'). diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 4de328801b..3f075d86f3 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -489,11 +489,11 @@ N *+X11* Unix only: can restore window title |X11| *:verbose-cmd* When 'verbose' is non-zero, listing the value of a Vim option or a key map or -a user-defined function or a command or a highlight group or an autocommand -will also display where it was last defined. If it was defined manually then -there will be no "Last set" message. When it was defined while executing a -function, user command or autocommand, the script in which it was defined is -reported. +an abbreviation or a user-defined function or a command or a highlight group +or an autocommand will also display where it was last defined. If it was +defined manually then there will be no "Last set" message. When it was +defined while executing a function, user command or autocommand, the script in +which it was defined is reported. {not available when compiled without the +eval feature} *K* diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index aeb79e3655..6ec82860f0 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0aa. Last change: 2005 Aug 28 +*version7.txt* For Vim version 7.0aa. Last change: 2005 Aug 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -565,8 +565,9 @@ For xterm most combinations of modifiers with function keys are recognized. When 'verbose' is set the output of ":highlight" will show where a highlight item was last set. -When 'verbose' is set the output of the ":map", ":command", ":function" and -":autocmd" commands will show where it was last defined. (Yegappan Lakshmanan) +When 'verbose' is set the output of the ":map", ":abbreviate", ":command", +":function" and ":autocmd" commands will show where it was last defined. +(Yegappan Lakshmanan) ============================================================================== IMPROVEMENTS *improvements-7* @@ -810,6 +811,10 @@ functions. Moved unix_expandpath() to misc1.c, so that it can also be used by os_mac.c without copying the code. +Mac: When running "make install" the runtime files are installed as for Unix. +Avoids that too many files are copied. When running "make" a link to the +runtime files is created to avoid a recursive copy that takes much time. + ============================================================================== BUG FIXES *bug-fixes-7* diff --git a/runtime/ftplugin/c.vim b/runtime/ftplugin/c.vim index 47b2ec6d2a..48055b0ad5 100644 --- a/runtime/ftplugin/c.vim +++ b/runtime/ftplugin/c.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: C " Maintainer: Bram Moolenaar -" Last Change: 2005 Jun 22 +" Last Change: 2005 Sep 01 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -15,12 +15,17 @@ let b:did_ftplugin = 1 let s:cpo_save = &cpo set cpo-=C -let b:undo_ftplugin = "setl fo< com< | if has('vms') | setl isk< | endif" +let b:undo_ftplugin = "setl fo< com< ofu< | if has('vms') | setl isk< | endif" " Set 'formatoptions' to break comment lines but not other lines, " and insert the comment leader when hitting or using "o". setlocal fo-=t fo+=croql +" Set completion with CTRL-X CTRL-O to autoloaded function. +if exists('&ofu') + setlocal ofu=ccomplete#Complete +endif + " Set 'comments' to format dashed lists in comments. setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:// diff --git a/runtime/lang/menu_it_it.latin1.vim b/runtime/lang/menu_it_it.latin1.vim index c8d6bb1b63..65228e1a42 100644 --- a/runtime/lang/menu_it_it.latin1.vim +++ b/runtime/lang/menu_it_it.latin1.vim @@ -1,7 +1,7 @@ " Menu Translations: Italian / Italiano " Maintainer: Antonio Colombo " Vlad Sandrini -" Last Change: 2005 Mar 16 +" Last Change: 2005 Aug 13 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -159,6 +159,26 @@ menut &Jump\ to\ this\ tagg^] &Vai\ a\ questa\ Tagg^] menut Jump\ &back^T Torna\ &indietro^T menut Build\ &Tags\ File Costruisci\ File\ &Tags\ +" Menu ortografia / Spelling +menut &Spelling &Ortografia + +menut &Spell\ Check\ On Attiva\ &Controllo\ ortografico +menut Spell\ Check\ &Off &Disattiva\ controllo\ ortografico +menut To\ &Next\ error]s Errore\ &Seguente]s +menut To\ &Previous\ error[s Errore\ &Precedente[s +menut Suggest\ &Correctionsz? &Suggerimentiz? +menut &Repeat\ correction:spellrepall &Ripeti\ correzione:spellrepall +menut Set\ language\ to\ "en" Imposta\ lingua\ a\ "en" +menut Set\ language\ to\ "en_au" Imposta\ lingua\ a\ "en_au" +menut Set\ language\ to\ "en_ca" Imposta\ lingua\ a\ "en_ca" +menut Set\ language\ to\ "en_gb" Imposta\ lingua\ a\ "en_gb" +menut Set\ language\ to\ "en_nz" Imposta\ lingua\ a\ "en_nz" +menut Set\ language\ to\ "en_us" Imposta\ lingua\ a\ "en_us" +menut Set\ language\ to\ "it" Imposta\ lingua\ a\ "it" +menut Set\ language\ to\ "it_it" Imposta\ lingua\ a\ "it_it" +menut Set\ language\ to\ "it_ch" Imposta\ lingua\ a\ "it_ch" +menut &Find\ More\ Languages &Trova\ altre\ lingue + " Menu piegature / Fold if has("folding") menut &Folding &Piegature @@ -212,7 +232,7 @@ menut &Close:cclose &Chiudi:cclose menut &Convert\ to\ HEX:%!xxd &Converti\ a\ Esadecimale:%!xxd menut Conve&rt\ back:%!xxd\ -r Conve&rti\ da\ Esadecimale:%!xxd\ -r -menut &Set\ Compiler Impo&sta\ Compilatore +menut &SeT\ Compiler Impo&sta\ Compilatore " Buffers / Buffer menut &Buffers &Buffer diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 23c0379db0..7aa1e0ff62 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: Bram Moolenaar -" Last Change: 2005 Aug 29 +" Last Change: 2005 Sep 01 " If there already is an option window, jump to that one. if bufwinnr("option-window") > 0 @@ -704,6 +704,9 @@ if has("insert_expand") call append("$", "completefunc\tuser defined function for Insert mode completion") call append("$", "\t(local to buffer)") call OptionL("cfu") + call append("$", "occultfunc\tfunction for filetype-specific Insert mode completion") + call append("$", "\t(local to buffer)") + call OptionL("ofu") call append("$", "dictionary\tlist of dictionary files for keyword completion") call append("$", "\t(global or local to buffer)") call OptionG("dict", &dict) diff --git a/runtime/spell/cy/cy_GB.diff b/runtime/spell/cy/cy_GB.diff new file mode 100644 index 0000000000..511e7188b6 --- /dev/null +++ b/runtime/spell/cy/cy_GB.diff @@ -0,0 +1,9 @@ +*** cy_GB.orig.aff Wed Aug 31 21:42:03 2005 +--- cy_GB.aff Wed Aug 31 21:43:10 2005 +*************** +*** 81,82 **** +--- 81,84 ---- + ++ MIDWORD '- ++ + PFX M Y 18 diff --git a/runtime/spell/cy/main.aap b/runtime/spell/cy/main.aap new file mode 100644 index 0000000000..ce6cb840f8 --- /dev/null +++ b/runtime/spell/cy/main.aap @@ -0,0 +1,82 @@ +# Aap recipe for Welsh Vim spell files. + +# Use a freshly compiled Vim if it exists. +@if os.path.exists('../../../src/vim'): + VIM = ../../../src/vim +@else: + :progsearch VIM vim + +SPELLDIR = .. +FILES = cy_GB.aff cy_GB.dic + +all: $SPELLDIR/cy.iso-8859-14.spl $SPELLDIR/cy.utf-8.spl \ + ../README_cy.txt + +$SPELLDIR/cy.iso-8859-14.spl : $FILES + :sys $VIM -u NONE -e -c "set enc=iso-8859-14" + -c "mkspell! $SPELLDIR/cy cy_GB" -c q + +$SPELLDIR/cy.utf-8.spl : $FILES + :sys $VIM -u NONE -e -c "set enc=utf-8" + -c "mkspell! $SPELLDIR/cy cy_GB" -c q + +../README_cy.txt : README_cy_GB.txt + :copy $source $target + +# +# Fetching the files from OpenOffice.org. +# +OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries +:attr {fetch = $OODIR/%file%} cy_GB.zip + +# The files don't depend on the .zip file so that we can delete it. +# Only download the zip file if the targets don't exist. +cy_GB.aff cy_GB.dic: {buildcheck=} + :assertpkg unzip patch + :fetch cy_GB.zip + :sys $UNZIP cy_GB.zip + :delete cy_GB.zip + :sys $VIM cy_GB.aff -e -c "set ff=unix" -c update -c q + :sys $VIM cy_GB.dic -e -c "set ff=unix" -c update -c q + :sys $VIM README_cy_GB.txt -e -c "set ff=unix" -c update -c q + @if not os.path.exists('cy_GB.orig.aff'): + :copy cy_GB.aff cy_GB.orig.aff + @if not os.path.exists('cy_GB.orig.dic'): + :copy cy_GB.dic cy_GB.orig.dic + @if os.path.exists('cy_GB.diff'): + :sys patch cy_GB.diff + :sys {force} diff -a -C 1 cy_GB.orig.dic cy_GB.dic >>cy_GB.diff + + +# Check for updated OpenOffice spell files. When there are changes the +# ".new.aff" and ".new.dic" files are left behind for manual inspection. + +check: + :assertpkg unzip diff + :fetch cy_GB.zip + :mkdir tmp + :cd tmp + @try: + @import stat + :sys $UNZIP ../cy_GB.zip + :sys {force} diff ../cy_GB.orig.aff cy_GB.aff >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy cy_GB.aff ../cy_GB.new.aff + :sys {force} diff ../cy_GB.orig.dic cy_GB.dic >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy cy_GB.dic ../cy_GB.new.dic + @finally: + :cd .. + :delete {r}{f}{q} tmp + :delete cy_GB.zip + + +# vim: set sts=4 sw=4 : diff --git a/runtime/spell/da/main.aap b/runtime/spell/da/main.aap index b84a80f932..65e1a2f7d4 100644 --- a/runtime/spell/da/main.aap +++ b/runtime/spell/da/main.aap @@ -35,6 +35,7 @@ da_DK.aff da_DK.dic: {buildcheck=} :fetch da_DK.zip :sys $UNZIP da_DK.zip :delete da_DK.zip + :delete contributors COPYING Makefile da_DK.excluded @if not os.path.exists('da_DK.orig.aff'): :copy da_DK.aff da_DK.orig.aff @if not os.path.exists('da_DK.orig.dic'): diff --git a/runtime/spell/en.ascii.spl b/runtime/spell/en.ascii.spl index 360e1ae9ce..0bbe6998f0 100644 Binary files a/runtime/spell/en.ascii.spl and b/runtime/spell/en.ascii.spl differ diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl index 03820d56fc..4d6f5ae62a 100644 Binary files a/runtime/spell/en.latin1.spl and b/runtime/spell/en.latin1.spl differ diff --git a/runtime/spell/en.utf-8.spl b/runtime/spell/en.utf-8.spl index 1013907ee4..d630a76637 100644 Binary files a/runtime/spell/en.utf-8.spl and b/runtime/spell/en.utf-8.spl differ diff --git a/runtime/spell/fo/main.aap b/runtime/spell/fo/main.aap index 948d4a472d..b9be542cf1 100644 --- a/runtime/spell/fo/main.aap +++ b/runtime/spell/fo/main.aap @@ -35,6 +35,7 @@ fo_FO.aff fo_FO.dic: {buildcheck=} :fetch fo_FO.zip :sys $UNZIP fo_FO.zip :delete fo_FO.zip + :delete contributors fo_FO.excluded Makefile COPYING @if not os.path.exists('fo_FO.orig.aff'): :copy fo_FO.aff fo_FO.orig.aff @if not os.path.exists('fo_FO.orig.dic'): diff --git a/runtime/spell/fr/main.aap b/runtime/spell/fr/main.aap index e7424326d5..1b70b83d78 100644 --- a/runtime/spell/fr/main.aap +++ b/runtime/spell/fr/main.aap @@ -19,8 +19,8 @@ $SPELLDIR/fr.utf-8.spl : $FILES :sys env LANG=fr_FR.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/fr fr_FR" -c q -../README_fr.txt : README_fr_FR.txt - :copy $source $target +../README_fr.txt : README_fr_FR.txt lisez-moi.txt + :cat $source >!$target # # Fetching the files from OpenOffice.org. diff --git a/runtime/spell/ga/ga_IE.diff b/runtime/spell/ga/ga_IE.diff new file mode 100644 index 0000000000..9b72853dce --- /dev/null +++ b/runtime/spell/ga/ga_IE.diff @@ -0,0 +1,27 @@ +*** ga_IE.orig.aff Wed Aug 31 16:48:49 2005 +--- ga_IE.aff Wed Aug 31 16:49:43 2005 +*************** +*** 37,38 **** +--- 37,58 ---- + ++ FOL ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ ++ LOW ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ ++ UPP ßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞÿ ++ ++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ¿ ++ SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep? ++ ++ MIDWORD '- ++ ++ MAP 9 ++ MAP aàáâãäå ++ MAP eèéêë ++ MAP iìíîï ++ MAP oòóôõö ++ MAP uùúûü ++ MAP nñ ++ MAP cç ++ MAP yÿý ++ MAP sß ++ + PFX S Y 18 diff --git a/runtime/spell/ga/main.aap b/runtime/spell/ga/main.aap new file mode 100644 index 0000000000..d745de5f4d --- /dev/null +++ b/runtime/spell/ga/main.aap @@ -0,0 +1,79 @@ +# Aap recipe for Irish Vim spell files. + +# Use a freshly compiled Vim if it exists. +@if os.path.exists('../../../src/vim'): + VIM = ../../../src/vim +@else: + :progsearch VIM vim + +SPELLDIR = .. +FILES = ga_IE.aff ga_IE.dic + +all: $SPELLDIR/ga.latin1.spl $SPELLDIR/ga.utf-8.spl ../README_ga.txt + +# I don't have an Irish locale, use the Dutch one instead. +$SPELLDIR/ga.latin1.spl : $FILES + :sys env LANG=nl_NL.ISO8859-1 + $VIM -u NONE -e -c "mkspell! $SPELLDIR/ga ga_IE" -c q + +$SPELLDIR/ga.utf-8.spl : $FILES + :sys env LANG=nl_NL.UTF-8 + $VIM -u NONE -e -c "mkspell! $SPELLDIR/ga ga_IE" -c q + +../README_ga.txt : README_ga_IE.txt + :copy $source $target + +# +# Fetching the files from OpenOffice.org. +# +OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries +:attr {fetch = $OODIR/%file%} ga_IE.zip + +# The files don't depend on the .zip file so that we can delete it. +# Only download the zip file if the targets don't exist. +ga_IE.aff ga_IE.dic: {buildcheck=} + :assertpkg unzip patch + :fetch ga_IE.zip + :sys $UNZIP ga_IE.zip + :delete ga_IE.zip + @if not os.path.exists('ga_IE.orig.aff'): + :copy ga_IE.aff ga_IE.orig.aff + @if not os.path.exists('ga_IE.orig.dic'): + :copy ga_IE.dic ga_IE.orig.dic + @if os.path.exists('ga_IE.diff'): + :sys patch ga_IE.diff + :sys {force} diff -a -C 1 ga_IE.orig.dic ga_IE.dic >>ga_IE.diff + + +# Check for updated OpenOffice spell files. When there are changes the +# ".new.aff" and ".new.dic" files are left behind for manual inspection. + +check: + :assertpkg unzip diff + :fetch ga_IE.zip + :mkdir tmp + :cd tmp + @try: + @import stat + :sys $UNZIP ../ga_IE.zip + :sys {force} diff ../ga_IE.orig.aff ga_IE.aff >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy ga_IE.aff ../ga_IE.new.aff + :sys {force} diff ../ga_IE.orig.dic ga_IE.dic >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy ga_IE.dic ../ga_IE.new.dic + @finally: + :cd .. + :delete {r}{f}{q} tmp + :delete ga_IE.zip + + +# vim: set sts=4 sw=4 : diff --git a/runtime/spell/gd/gd_GB.diff b/runtime/spell/gd/gd_GB.diff new file mode 100644 index 0000000000..616bae7241 --- /dev/null +++ b/runtime/spell/gd/gd_GB.diff @@ -0,0 +1,26 @@ +*** gd_GB.orig.aff Wed Aug 31 20:50:02 2005 +--- gd_GB.aff Wed Aug 31 20:50:43 2005 +*************** +*** 19 **** +--- 19,39 ---- + TRY ahinrdesclgoutmbàf-òACìTùBpGSDMèIRPLNEFéO'UóÀÒÌÙHÉÈ ++ ++ FOL ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ ++ LOW ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ ++ UPP ßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞÿ ++ ++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ¿ ++ SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep? ++ ++ MIDWORD '- ++ ++ MAP 9 ++ MAP aàáâãäå ++ MAP eèéêë ++ MAP iìíîï ++ MAP oòóôõö ++ MAP uùúûü ++ MAP nñ ++ MAP cç ++ MAP yÿý ++ MAP sß diff --git a/runtime/spell/gd/main.aap b/runtime/spell/gd/main.aap new file mode 100644 index 0000000000..8992f032c0 --- /dev/null +++ b/runtime/spell/gd/main.aap @@ -0,0 +1,78 @@ +# Aap recipe for Scottish Gaelic Vim spell files. + +# Use a freshly compiled Vim if it exists. +@if os.path.exists('../../../src/vim'): + VIM = ../../../src/vim +@else: + :progsearch VIM vim + +SPELLDIR = .. +FILES = gd_GB.aff gd_GB.dic + +all: $SPELLDIR/gd.latin1.spl $SPELLDIR/gd.utf-8.spl ../README_gd.txt + +$SPELLDIR/gd.latin1.spl : $FILES + :sys env LANG=gd_GB.ISO8859-1 + $VIM -u NONE -e -c "mkspell! $SPELLDIR/gd gd_GB" -c q + +$SPELLDIR/gd.utf-8.spl : $FILES + :sys env LANG=gd_GB.UTF-8 + $VIM -u NONE -e -c "mkspell! $SPELLDIR/gd gd_GB" -c q + +../README_gd.txt : README_gd_GB.txt + :copy $source $target + +# +# Fetching the files from OpenOffice.org. +# +OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries +:attr {fetch = $OODIR/%file%} gd_GB.zip + +# The files don't depend on the .zip file so that we can delete it. +# Only download the zip file if the targets don't exist. +gd_GB.aff gd_GB.dic: {buildcheck=} + :assertpkg unzip patch + :fetch gd_GB.zip + :sys $UNZIP gd_GB.zip + :delete gd_GB.zip + @if not os.path.exists('gd_GB.orig.aff'): + :copy gd_GB.aff gd_GB.orig.aff + @if not os.path.exists('gd_GB.orig.dic'): + :copy gd_GB.dic gd_GB.orig.dic + @if os.path.exists('gd_GB.diff'): + :sys patch gd_GB.diff + :sys {force} diff -a -C 1 gd_GB.orig.dic gd_GB.dic >>gd_GB.diff + + +# Check for updated OpenOffice spell files. When there are changes the +# ".new.aff" and ".new.dic" files are left behind for manual inspection. + +check: + :assertpkg unzip diff + :fetch gd_GB.zip + :mkdir tmp + :cd tmp + @try: + @import stat + :sys $UNZIP ../gd_GB.zip + :sys {force} diff ../gd_GB.orig.aff gd_GB.aff >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy gd_GB.aff ../gd_GB.new.aff + :sys {force} diff ../gd_GB.orig.dic gd_GB.dic >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy gd_GB.dic ../gd_GB.new.dic + @finally: + :cd .. + :delete {r}{f}{q} tmp + :delete gd_GB.zip + + +# vim: set sts=4 sw=4 : diff --git a/runtime/spell/hr/main.aap b/runtime/spell/hr/main.aap index 699d61fe75..1b998ca0e9 100644 --- a/runtime/spell/hr/main.aap +++ b/runtime/spell/hr/main.aap @@ -9,8 +9,8 @@ SPELLDIR = .. FILES = hr_HR.aff hr_HR.dic -all: $SPELLDIR/hr.iso-8859-2.spl $SPELLDIR/pl.utf-8.spl \ - $SPELLDIR/hr.cp1250.spl ../README_pl.txt +all: $SPELLDIR/hr.iso-8859-2.spl $SPELLDIR/hr.utf-8.spl \ + $SPELLDIR/hr.cp1250.spl ../README_hr.txt $SPELLDIR/hr.iso-8859-2.spl : $FILES :sys env LANG=hr_HR.ISO8859-2 $VIM -u NONE -e -c "mkspell! $SPELLDIR/hr hr_HR" -c q diff --git a/runtime/spell/id/id_ID.diff b/runtime/spell/id/id_ID.diff new file mode 100644 index 0000000000..d0273ae6dd --- /dev/null +++ b/runtime/spell/id/id_ID.diff @@ -0,0 +1,22 @@ +*** id_ID.orig.aff Wed Aug 31 16:41:11 2005 +--- id_ID.aff Wed Aug 31 16:43:29 2005 +*************** +*** 18,19 **** +--- 18,26 ---- + ++ FOL ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ ++ LOW ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ ++ UPP ßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞÿ ++ ++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ¿ ++ SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep? ++ + PFX A Y 1 +*** id_ID.orig.dic Wed Aug 31 16:41:11 2005 +--- id_ID.dic Wed Aug 31 16:41:35 2005 +*************** +*** 21729,21731 **** + berabarkan +- buletin + kernu +--- 21729,21730 ---- diff --git a/runtime/spell/id/main.aap b/runtime/spell/id/main.aap new file mode 100644 index 0000000000..8c04b55415 --- /dev/null +++ b/runtime/spell/id/main.aap @@ -0,0 +1,79 @@ +# Aap recipe for Indonesian Vim spell files. + +# Use a freshly compiled Vim if it exists. +@if os.path.exists('../../../src/vim'): + VIM = ../../../src/vim +@else: + :progsearch VIM vim + +SPELLDIR = .. +FILES = id_ID.aff id_ID.dic + +all: $SPELLDIR/id.latin1.spl $SPELLDIR/id.utf-8.spl ../README_id.txt + +# I don't have an Indonesian locale, use the Dutch one instead. +$SPELLDIR/id.latin1.spl : $FILES + :sys env LANG=nl_NL.ISO8859-1 + $VIM -u NONE -e -c "mkspell! $SPELLDIR/id id_ID" -c q + +$SPELLDIR/id.utf-8.spl : $FILES + :sys env LANG=nl_NL.UTF-8 + $VIM -u NONE -e -c "mkspell! $SPELLDIR/id id_ID" -c q + +../README_id.txt : README_id_ID.txt + :copy $source $target + +# +# Fetching the files from OpenOffice.org. +# +OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries +:attr {fetch = $OODIR/%file%} id_ID.zip + +# The files don't depend on the .zip file so that we can delete it. +# Only download the zip file if the targets don't exist. +id_ID.aff id_ID.dic: {buildcheck=} + :assertpkg unzip patch + :fetch id_ID.zip + :sys $UNZIP id_ID.zip + :delete id_ID.zip + @if not os.path.exists('id_ID.orig.aff'): + :copy id_ID.aff id_ID.orig.aff + @if not os.path.exists('id_ID.orig.dic'): + :copy id_ID.dic id_ID.orig.dic + @if os.path.exists('id_ID.diff'): + :sys patch id_ID.diff + :sys {force} diff -a -C 1 id_ID.orig.dic id_ID.dic >>id_ID.diff + + +# Check for updated OpenOffice spell files. When there are changes the +# ".new.aff" and ".new.dic" files are left behind for manual inspection. + +check: + :assertpkg unzip diff + :fetch id_ID.zip + :mkdir tmp + :cd tmp + @try: + @import stat + :sys $UNZIP ../id_ID.zip + :sys {force} diff ../id_ID.orig.aff id_ID.aff >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy id_ID.aff ../id_ID.new.aff + :sys {force} diff ../id_ID.orig.dic id_ID.dic >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy id_ID.dic ../id_ID.new.dic + @finally: + :cd .. + :delete {r}{f}{q} tmp + :delete id_ID.zip + + +# vim: set sts=4 sw=4 : diff --git a/runtime/spell/it/main.aap b/runtime/spell/it/main.aap index eaced68027..f1bd742905 100644 --- a/runtime/spell/it/main.aap +++ b/runtime/spell/it/main.aap @@ -19,8 +19,8 @@ $SPELLDIR/it.utf-8.spl : $FILES :sys env LANG=it_IT.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/it it_IT" -c q -../README_it.txt : README_it_IT.txt - :copy $source $target +../README_it.txt : README_it_IT.txt README.txt + :cat $source >! $target # # Fetching the files from OpenOffice.org. @@ -35,6 +35,7 @@ it_IT.aff it_IT.dic: {buildcheck=} :fetch it_IT.zip :sys $UNZIP it_IT.zip :delete it_IT.zip + :delete GPL.txt history.txt license.txt notes.txt statistiche.sxc thanks.txt @if not os.path.exists('it_IT.orig.aff'): :copy it_IT.aff it_IT.orig.aff @if not os.path.exists('it_IT.orig.dic'): diff --git a/runtime/spell/ku/ku_TR.diff b/runtime/spell/ku/ku_TR.diff new file mode 100644 index 0000000000..e69de29bb2 diff --git a/runtime/spell/ku/main.aap b/runtime/spell/ku/main.aap new file mode 100644 index 0000000000..200fb2f1e3 --- /dev/null +++ b/runtime/spell/ku/main.aap @@ -0,0 +1,82 @@ +# Aap recipe for Kurdish Vim spell files. + +# Use a freshly compiled Vim if it exists. +@if os.path.exists('../../../src/vim'): + VIM = ../../../src/vim +@else: + :progsearch VIM vim + +SPELLDIR = .. +FILES = ku_TR.aff ku_TR.dic + +# I don't have a Kurdish locale, us the Turkish one. +all: $SPELLDIR/ku.iso-8859-9.spl $SPELLDIR/ku.utf-8.spl \ + ../README_ku.txt + +$SPELLDIR/ku.iso-8859-9.spl : $FILES + :sys env LANG=tr_TR.ISO8859-9 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ku ku_TR" -c q + +$SPELLDIR/ku.utf-8.spl : $FILES + :sys env LANG=tr_TR.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ku ku_TR" -c q + +../README_ku.txt: README_ku_TR.txt + :copy $source $target + +# +# Fetching the files from OpenOffice.org. +# +OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries +:attr {fetch = $OODIR/%file%} ku_TR.zip + +# The files don't depend on the .zip file so that we can delete it. +# Only download the zip file if the targets don't exist. +# This is a bit tricky, since the file name includes the date. +ku_TR.aff ku_TR.dic: {buildcheck=} + :assertpkg unzip patch + :fetch ku_TR.zip + :sys $UNZIP ku_TR.zip + :delete ku_TR.zip + :sys $VIM ku_TR.aff -e -c "set ff=unix" -c update -c q + :sys $VIM ku_TR.dic -e -c "set ff=unix" -c update -c q + :sys $VIM README_ku_TR.txt -e -c "set ff=unix" -c update -c q + @if not os.path.exists('ku_TR.orig.aff'): + :copy ku_TR.aff ku_TR.orig.aff + @if not os.path.exists('ku_TR.orig.dic'): + :copy ku_TR.dic ku_TR.orig.dic + @if os.path.exists('ku_TR.diff'): + :sys patch ku_TR.diff + :sys {force} diff -a -C 1 ku_TR.orig.dic ku_TR.dic >>ku_TR.diff + + +# Check for updated spell files. When there are changes the +# ".new.aff" and ".new.dic" files are left behind for manual inspection. + +check: + :assertpkg unzip diff + :fetch ku_TR.zip + :mkdir tmp + :cd tmp + @try: + @import stat + :sys $UNZIP ../ku_TR.zip + :sys {force} diff ../ku_TR.orig.aff ku_TR.aff >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy ku_TR.aff ../ku_TR.new.aff + :sys {force} diff ../ku_TR.orig.dic ku_TR.dic >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy ku_TR.dic ../ku_TR.new.dic + @finally: + :cd .. + :delete {r}{f}{q} tmp + :delete ku_TR.zip + + +# vim: set sts=4 sw=4 : diff --git a/runtime/spell/la/la.diff b/runtime/spell/la/la.diff new file mode 100644 index 0000000000..787b091555 --- /dev/null +++ b/runtime/spell/la/la.diff @@ -0,0 +1,12 @@ +*** la.orig.aff Wed Aug 31 17:09:50 2005 +--- la.aff Wed Aug 31 17:10:42 2005 +*************** +*** 2,3 **** +--- 2,8 ---- + TRY esianrtolcdugmphbyfvkw ++ ++ FOL ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ ++ LOW ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ ++ UPP ßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞÿ ++ + SFX a Y 124 diff --git a/runtime/spell/la/main.aap b/runtime/spell/la/main.aap new file mode 100644 index 0000000000..0cf1d8ab3a --- /dev/null +++ b/runtime/spell/la/main.aap @@ -0,0 +1,78 @@ +# Aap recipe for Latin Vim spell files. + +# Use a freshly compiled Vim if it exists. +@if os.path.exists('../../../src/vim'): + VIM = ../../../src/vim +@else: + :progsearch VIM vim + +SPELLDIR = .. +FILES = la.aff la.dic + +all: $SPELLDIR/la.latin1.spl $SPELLDIR/la.utf-8.spl ../README_la.txt + +$SPELLDIR/la.latin1.spl : $FILES + :sys env LANG=la_LN.ISO8859-1 + $VIM -u NONE -e -c "mkspell! $SPELLDIR/la la" -c q + +$SPELLDIR/la.utf-8.spl : $FILES + :sys $VIM -u NONE -e -c "set enc=utf-8" + -c "mkspell! $SPELLDIR/la la" -c q + +../README_la.txt : README_la.txt + :copy $source $target + +# +# Fetching the files from OpenOffice.org. +# +OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries +:attr {fetch = $OODIR/%file%} la.zip + +# The files don't depend on the .zip file so that we can delete it. +# Only download the zip file if the targets don't exist. +la.aff la.dic: {buildcheck=} + :assertpkg unzip patch + :fetch la.zip + :sys $UNZIP la.zip + :delete la.zip + @if not os.path.exists('la.orig.aff'): + :copy la.aff la.orig.aff + @if not os.path.exists('la.orig.dic'): + :copy la.dic la.orig.dic + @if os.path.exists('la.diff'): + :sys patch la.diff + :sys {force} diff -a -C 1 la.orig.dic la.dic >>la.diff + + +# Check for updated OpenOffice spell files. When there are changes the +# ".new.aff" and ".new.dic" files are left behind for manual inspection. + +check: + :assertpkg unzip diff + :fetch la.zip + :mkdir tmp + :cd tmp + @try: + @import stat + :sys $UNZIP ../la.zip + :sys {force} diff ../la.orig.aff la.aff >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy la.aff ../la.new.aff + :sys {force} diff ../la.orig.dic la.dic >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy la.dic ../la.new.dic + @finally: + :cd .. + :delete {r}{f}{q} tmp + :delete la.zip + + +# vim: set sts=4 sw=4 : diff --git a/runtime/spell/lt/lt_LT.diff b/runtime/spell/lt/lt_LT.diff new file mode 100644 index 0000000000..e69de29bb2 diff --git a/runtime/spell/lt/main.aap b/runtime/spell/lt/main.aap new file mode 100644 index 0000000000..92edad21d0 --- /dev/null +++ b/runtime/spell/lt/main.aap @@ -0,0 +1,78 @@ +# Aap recipe for Lithuanian Vim spell files. + +# Use a freshly compiled Vim if it exists. +@if os.path.exists('../../../src/vim'): + VIM = ../../../src/vim +@else: + :progsearch VIM vim + +SPELLDIR = .. +FILES = lt_LT.aff lt_LT.dic + +all: $SPELLDIR/lt.iso-8859-13.spl $SPELLDIR/lt.utf-8.spl \ + ../README_lt.txt + +$SPELLDIR/lt.iso-8859-13.spl : $FILES + :sys env LANG=lt_LT.ISO8859-13 $VIM -u NONE -e -c "mkspell! $SPELLDIR/lt lt_LT" -c q + +$SPELLDIR/lt.utf-8.spl : $FILES + :sys env LANG=lt_LT.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/lt lt_LT" -c q + +../README_lt.txt: README_lt_LT.txt + :copy $source $target + +# +# Fetching the files from OpenOffice.org. +# +OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries +:attr {fetch = $OODIR/%file%} lt_LT.zip + +# The files don't depend on the .zip file so that we can delete it. +# Only download the zip file if the targets don't exist. +# This is a bit tricky, since the file name includes the date. +lt_LT.aff lt_LT.dic: {buildcheck=} + :assertpkg unzip patch + :fetch lt_LT.zip + :sys $UNZIP lt_LT.zip + :delete lt_LT.zip + @if not os.path.exists('lt_LT.orig.aff'): + :copy lt_LT.aff lt_LT.orig.aff + @if not os.path.exists('lt_LT.orig.dic'): + :copy lt_LT.dic lt_LT.orig.dic + @if os.path.exists('lt_LT.diff'): + :sys patch lt_LT.diff + :sys {force} diff -a -C 1 lt_LT.orig.dic lt_LT.dic >>lt_LT.diff + + +# Check for updated spell files. When there are changes the +# ".new.aff" and ".new.dic" files are left behind for manual inspection. + +check: + :assertpkg unzip diff + :fetch lt_LT.zip + :mkdir tmp + :cd tmp + @try: + @import stat + :sys $UNZIP ../lt_LT.zip + :sys {force} diff ../lt_LT.orig.aff lt_LT.aff >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy lt_LT.aff ../lt_LT.new.aff + :sys {force} diff ../lt_LT.orig.dic lt_LT.dic >d + @if os.stat('d')[stat.ST_SIZE] > 0: + :copy lt_LT.dic ../lt_LT.new.dic + @finally: + :cd .. + :delete {r}{f}{q} tmp + :delete lt_LT.zip + + +# vim: set sts=4 sw=4 : diff --git a/runtime/spell/lv/main.aap b/runtime/spell/lv/main.aap new file mode 100644 index 0000000000..10cacd82a6 --- /dev/null +++ b/runtime/spell/lv/main.aap @@ -0,0 +1,83 @@ +# Aap recipe for Latvian Vim spell files. + +# Use a freshly compiled Vim if it exists. +@if os.path.exists('../../../src/vim'): + VIM = ../../../src/vim +@else: + :progsearch VIM vim + +SPELLDIR = .. +FILES = lv_LV.aff lv_LV.dic + +# I don't have a Latvian locale, use Lithuanian instead. +all: $SPELLDIR/lv.iso-8859-13.spl $SPELLDIR/lv.utf-8.spl \ + ../README_lv.txt + +$SPELLDIR/lv.iso-8859-13.spl : $FILES + :sys env LANG=lt_LT.ISO8859-13 $VIM -u NONE -e -c "mkspell! $SPELLDIR/lv lv_LV" -c q + +$SPELLDIR/lv.utf-8.spl : $FILES + :sys env LANG=lt_LT.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/lv lv_LV" -c q + +../README_lv.txt: README_lv_LV.txt + :copy $source $target + +# +# Fetching the files from OpenOffice.org. +# +OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries +:attr {fetch = $OODIR/%file%} lv_LV.zip + +# The files don't depend on the .zip file so that we can delete it. +# Only download the zip file if the targets don't exist. +# This is a bit tricky, since the file name includes the date. +lv_LV.aff lv_LV.dic: {buildcheck=} + :assertpkg unzip patch + :fetch lv_LV.zip + :sys $UNZIP lv_LV.zip + :delete lv_LV.zip + :delete changelog.txt gpl.txt lin-lv_LV_add.sh win-lv_