OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • SSH
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisiónce2181d14aa08a59250267dbec36bba362eeb908 (tree)
Tiempo2005-08-31 06:55:26
Autorvimboss
Commitervimboss

Log Message

updated for version 7.0139

Cambiar Resumen

Diferencia incremental

diff -r 4772a5e3f9fa -r ce2181d14aa0 Filelist
--- a/Filelist Mon Aug 29 22:25:38 2005 +0000
+++ b/Filelist Tue Aug 30 21:55:26 2005 +0000
@@ -377,6 +377,7 @@
377377 src/os_mac.pbproj/project.pbxproj \
378378 src/proto/gui_mac.pro \
379379 src/proto/os_mac.pro \
380+ src/proto/os_mac_conv.pro \
380381
381382 # source files for VMS (in the extra archive)
382383 SRC_VMS = \
diff -r 4772a5e3f9fa -r ce2181d14aa0 runtime/doc/filetype.txt
--- a/runtime/doc/filetype.txt Mon Aug 29 22:25:38 2005 +0000
+++ b/runtime/doc/filetype.txt Tue Aug 30 21:55:26 2005 +0000
@@ -1,4 +1,4 @@
1-*filetype.txt* For Vim version 7.0aa. Last change: 2005 Aug 24
1+*filetype.txt* For Vim version 7.0aa. Last change: 2005 Aug 30
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -44,15 +44,21 @@
4444 name, the file $VIMRUNTIME/scripts.vim is used to detect it from the
4545 contents of the file.
4646
47-To add your own file types, see |new-filetype| below.
47+To add your own file types, see |new-filetype| below. To search for help on a
48+filetype prepend "ft-" and optionally append "-syntax", "-indent" or
49+"-plugin". For example: >
50+ :help ft-vim-indent
51+ :help ft-vim-syntax
52+ :help ft-man-plugin
4853
4954 If the file type is not detected automatically, or it finds the wrong type,
5055 you can either set the 'filetype' option manually, or add a modeline to your
5156 file. Example, for in an IDL file use the command: >
5257 :set filetype=idl
53-or add this |modeline| to the file: >
54- /* vim: set filetype=idl : */
55-<
58+
59+or add this |modeline| to the file:
60+ /* vim: set filetype=idl : */ ~
61+
5662 *:filetype-plugin-on*
5763 You can enable loading the plugin files for specific file types with: >
5864 :filetype plugin on
@@ -132,16 +138,16 @@
132138 can be used to overrule the filetype used for certain extensions:
133139
134140 file name variable ~
135- *.asa g:filetype_asa |aspvbs-syntax| |aspperl-syntax|
136- *.asp g:filetype_asp |aspvbs-syntax| |aspperl-syntax|
137- *.asm g:asmsyntax |asm-syntax|
141+ *.asa g:filetype_asa |ft-aspvbs-syntax| |ft-aspperl-syntax|
142+ *.asp g:filetype_asp |ft-aspvbs-syntax| |ft-aspperl-syntax|
143+ *.asm g:asmsyntax |ft-asm-syntax|
138144 *.prg g:filetype_prg
139145 *.pl g:filetype_pl
140146 *.inc g:filetype_inc
141- *.w g:filetype_w |cweb-syntax|
142- *.i g:filetype_i |progress-syntax|
143- *.p g:filetype_p |pascal-syntax|
144- *.sh g:bash_is_sh |sh-syntax|
147+ *.w g:filetype_w |ft-cweb-syntax|
148+ *.i g:filetype_i |ft-progress-syntax|
149+ *.p g:filetype_p |ft-pascal-syntax|
150+ *.sh g:bash_is_sh |ft-sh-syntax|
145151
146152 *filetype-ignore*
147153 To avoid that certain files are being inspected, the g:ft_ignore_pat variable
@@ -380,7 +386,7 @@
380386 3. Docs for the default filetype plugins. *ftplugin-docs*
381387
382388
383-CHANGELOG *changelog-plugin*
389+CHANGELOG *ft-changelog-plugin*
384390
385391 Allows for easy entrance of Changelog entries in Changelog files. There are
386392 some commands, mappings, and variables worth exploring:
@@ -466,7 +472,7 @@
466472 the Changelog.
467473
468474
469-FORTRAN *fortran-plugin*
475+FORTRAN *ft-fortran-plugin*
470476
471477 Options:
472478 'expandtab' is switched on to avoid tabs as required by the Fortran
@@ -476,10 +482,10 @@
476482 'formatoptions' is set to break code and comment lines and to preserve long
477483 lines. You can format comments with |gq|.
478484 For further discussion of fortran_have_tabs and the method used for the
479-detection of source format see |fortran-syntax|.
485+detection of source format see |ft-fortran-syntax|.
480486
481487
482-MAIL *mail-plugin*
488+MAIL *ft-mail-plugin*
483489
484490 Options:
485491 'modeline' is switched off to avoid the danger of trojan horses, and to
@@ -496,7 +502,7 @@
496502 to the end of the file in Normal mode. This means "> " is inserted in
497503 each line.
498504
499-MAN *man-plugin* *:Man*
505+MAN *ft-man-plugin* *:Man*
500506
501507 Displays a manual page in a nice way. Also see the user manual
502508 |find-manpage|.
@@ -523,7 +529,7 @@
523529 CTRL-T Jump back to the previous manual page.
524530
525531
526-RPM SPEC *spec-plugin*
532+RPM SPEC *ft-spec-plugin*
527533
528534 Since the text for this plugin is rather long it has been put in a separate
529535 file: |pi_spec.txt|.
diff -r 4772a5e3f9fa -r ce2181d14aa0 runtime/doc/indent.txt
--- a/runtime/doc/indent.txt Mon Aug 29 22:25:38 2005 +0000
+++ b/runtime/doc/indent.txt Tue Aug 30 21:55:26 2005 +0000
@@ -1,4 +1,4 @@
1-*indent.txt* For Vim version 7.0aa. Last change: 2005 Mar 29
1+*indent.txt* For Vim version 7.0aa. Last change: 2005 Aug 30
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -449,7 +449,7 @@
449449 REMARKS ABOUT SPECIFIC INDENT FILES ~
450450
451451
452-FORTRAN *fortran-indent*
452+FORTRAN *ft-fortran-indent*
453453
454454 Block if, select case, and where constructs are indented. Comments, labelled
455455 statements and continuation lines are indented if the Fortran is in free
@@ -457,7 +457,7 @@
457457 form because of the left margin requirements. Hence manual indent corrections
458458 will be necessary for labelled statements and continuation lines when fixed
459459 source form is being used. For further discussion of the method used for the
460-detection of source format see |fortran-syntax|.
460+detection of source format see |ft-fortran-syntax|.
461461
462462 Do loops ~
463463 All do loops are left unindented by default. Do loops can be unstructured in
@@ -485,7 +485,7 @@
485485 other extensions such as .for.
486486
487487
488-PYTHON *python-indent*
488+PYTHON *ft-python-indent*
489489
490490 The amount of indent can be set for the following situations. The examples
491491 given are de the defaults. Note that the variables are set to an expression,
@@ -499,7 +499,7 @@
499499 let g:pyindent_continue = '&sw * 2'
500500
501501
502-VERILOG *verilog-indent*
502+VERILOG *ft-verilog-indent*
503503
504504 General block statements such as if, for, case, always, initial, function,
505505 specify and begin, etc., are indented. The module block statements (first
@@ -534,7 +534,7 @@
534534 Make sure to do ":set cmdheight=2" first to allow the display of the message.
535535
536536
537-VIM *vim-indent*
537+VIM *ft-vim-indent*
538538
539539 For indenting Vim scripts there is one variable that specifies the amount of
540540 indent for a continuation line, a line that starts with a backslash: >
diff -r 4772a5e3f9fa -r ce2181d14aa0 runtime/doc/pi_netrw.txt
--- a/runtime/doc/pi_netrw.txt Mon Aug 29 22:25:38 2005 +0000
+++ b/runtime/doc/pi_netrw.txt Tue Aug 30 21:55:26 2005 +0000
@@ -904,7 +904,7 @@
904904 the V (|linewise-visual|).
905905
906906
907-HIDING FILES OR DIRECTORIES *g:netrw-a*
907+HIDING FILES OR DIRECTORIES *g:netrw-a* *netrw-a*
908908
909909 Netrw's browsing facility allows one to use the hiding list in one of
910910 three ways: ignore it, hide files which match, and show only those files
@@ -1077,7 +1077,7 @@
10771077 history (query). (see |netrw-b|, |netrw-B|, |netrw-u|, and |netrw-U|)
10781078
10791079
1080-IMPROVING DIRECTORY BROWSING *netrw-listhack*
1080+IMPROVING DIRECTORY BROWSING *netrw-list-hack*
10811081
10821082 Especially with the remote directory browser, constantly entering the password
10831083 is tedious.
diff -r 4772a5e3f9fa -r ce2181d14aa0 runtime/doc/spell.txt
--- a/runtime/doc/spell.txt Mon Aug 29 22:25:38 2005 +0000
+++ b/runtime/doc/spell.txt Tue Aug 30 21:55:26 2005 +0000
@@ -1,4 +1,4 @@
1-*spell.txt* For Vim version 7.0aa. Last change: 2005 Aug 29
1+*spell.txt* For Vim version 7.0aa. Last change: 2005 Aug 30
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -64,13 +64,19 @@
6464
6565 *zg*
6666 zg Add word under the cursor as a good word to the first
67- name in 'spellfile'. In Visual mode the selected
68- characters are added as a word (including white
69- space!). If the word is explicitly marked as bad word
70- in another spell file the result is unpredictable.
71- A count may precede the command to indicate the entry
72- in 'spellfile' to be used. A count of two uses the
73- second entry.
67+ name in 'spellfile'. A count may precede the command
68+ to indicate the entry in 'spellfile' to be used. A
69+ count of two uses the second entry.
70+
71+ In Visual mode the selected characters are added as a
72+ word (including white space!).
73+ When the cursor is on text that is marked as badly
74+ spelled then the marked text is used.
75+ Otherwise the word under the cursor, separated by
76+ non-word characters, is used.
77+
78+ If the word is explicitly marked as bad word in
79+ another spell file the result is unpredictable.
7480
7581 *zG*
7682 zG Like "zg" but add the word to the internal word list
diff -r 4772a5e3f9fa -r ce2181d14aa0 runtime/doc/syntax.txt
--- a/runtime/doc/syntax.txt Mon Aug 29 22:25:38 2005 +0000
+++ b/runtime/doc/syntax.txt Tue Aug 30 21:55:26 2005 +0000
@@ -1,4 +1,4 @@
1-*syntax.txt* For Vim version 7.0aa. Last change: 2005 Aug 14
1+*syntax.txt* For Vim version 7.0aa. Last change: 2005 Aug 30
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -454,7 +454,7 @@
454454 for f in *.[ch]; do gvim -f +"syn on" +"run! syntax/2html.vim" +"wq" +"q" $f; done
455455 <
456456
457-ABEL *abel.vim* *abel-syntax*
457+ABEL *abel.vim* *ft-abel-syntax*
458458
459459 ABEL highlighting provides some user-defined options. To enable them, assign
460460 any value to the respective variable. Example: >
@@ -467,7 +467,7 @@
467467 abel_cpp_comments_illegal do not interpret '//' as inline comment leader
468468
469469
470-ADA *ada.vim* *ada-syntax*
470+ADA *ada.vim* *ft-ada-syntax*
471471
472472 This mode is designed for the 1995 edition of Ada ("Ada95"), which
473473 includes support for objected-programming, protected types, and so on.
@@ -515,7 +515,7 @@
515515 the performance unacceptable, turn on ada_withuse_ordinary.
516516
517517
518-ANT *ant.vim* *ant-syntax*
518+ANT *ant.vim* *ft-ant-syntax*
519519
520520 The ant syntax file provides syntax highlighting for javascript and python
521521 by default. Syntax highlighting for other script languages can be installed
@@ -533,7 +533,7 @@
533533 See |mysyntaxfile-add| for installing script languages permanently.
534534
535535
536-APACHE *apache.vim* *apache-syntax*
536+APACHE *apache.vim* *ft-apache-syntax*
537537
538538 The apache syntax file provides syntax highlighting depending on Apache HTTP
539539 server version, by default for 1.3.x. Set "apache_version" to Apache version
@@ -543,8 +543,8 @@
543543 <
544544
545545 *asm.vim* *asmh8300.vim* *nasm.vim* *masm.vim* *asm68k*
546-ASSEMBLY *asm-syntax* *asmh8300-syntax* *nasm-syntax* *masm-syntax*
547- *asm68k-syntax* *fasm.vim*
546+ASSEMBLY *ft-asm-syntax* *ft-asmh8300-syntax* *ft-nasm-syntax*
547+ *ft-masm-syntax* *ft-asm68k-syntax* *fasm.vim*
548548
549549 Files matching "*.i" could be Progress or Assembly. If the automatic detection
550550 doesn't work for you, or you don't edit Progress at all, use this in your
@@ -598,7 +598,7 @@
598598 nasm_no_warn potentially risky syntax not as ToDo
599599
600600
601-ASPPERL and ASPVBS *aspperl-syntax* *aspvbs-syntax*
601+ASPPERL and ASPVBS *ft-aspperl-syntax* *ft-aspvbs-syntax*
602602
603603 *.asp and *.asa files could be either Perl or Visual Basic script. Since it's
604604 hard to detect this you can set two global variables to tell Vim what you are
@@ -610,7 +610,7 @@
610610 :let g:filetype_asp = "aspvbs"
611611
612612
613-BASIC *basic.vim* *vb.vim* *basic-syntax* *vb-syntax*
613+BASIC *basic.vim* *vb.vim* *ft-basic-syntax* *ft-vb-syntax*
614614
615615 Both Visual Basic and "normal" basic use the extension ".bas". To detect
616616 which one should be used, Vim checks for the string "VB_Name" in the first
@@ -619,7 +619,7 @@
619619 Basic.
620620
621621
622-C *c.vim* *c-syntax*
622+C *c.vim* *ft-c-syntax*
623623
624624 A few things in C highlighting are optional. To enable them assign any value
625625 to the respective variable. Example: >
@@ -686,7 +686,7 @@
686686 syn sync fromstart
687687 set foldmethod=syntax
688688
689-CH *ch.vim* *ch-syntax*
689+CH *ch.vim* *ft-ch-syntax*
690690
691691 C/C++ interpreter. Ch has similar syntax highlighting to C and builds upon
692692 the C syntax file. See |c.vim| for all the settings that are available for C.
@@ -696,7 +696,7 @@
696696 :let ch_syntax_for_h = 1
697697
698698
699-CHILL *chill.vim* *chill-syntax*
699+CHILL *chill.vim* *ft-chill-syntax*
700700
701701 Chill syntax highlighting is similar to C. See |c.vim| for all the settings
702702 that are available. Additionally there is:
@@ -706,7 +706,7 @@
706706 chill_minlines like c_minlines
707707
708708
709-CHANGELOG *changelog.vim* *changelog-syntax*
709+CHANGELOG *changelog.vim* *ft-changelog-syntax*
710710
711711 ChangeLog supports highlighting spaces at the start of a line.
712712 If you do not like this, add following line to your .vimrc: >
@@ -722,7 +722,7 @@
722722 This works immediately.
723723
724724
725-COBOL *cobol.vim* *cobol-syntax*
725+COBOL *cobol.vim* *ft-cobol-syntax*
726726
727727 COBOL highlighting has different needs for legacy code than it does for fresh
728728 development. This is due to differences in what is being done (maintenance
@@ -733,7 +733,7 @@
733733 :unlet cobol_legacy_code
734734
735735
736-COLD FUSION *coldfusion.vim* *coldfusion-syntax*
736+COLD FUSION *coldfusion.vim* *ft-coldfusion-syntax*
737737
738738 The ColdFusion has its own version of HTML comments. To turn on ColdFusion
739739 comment highlighting, add the following line to your startup file: >
@@ -743,7 +743,7 @@
743743 The ColdFusion syntax file is based on the HTML syntax file.
744744
745745
746-CSH *csh.vim* *csh-syntax*
746+CSH *csh.vim* *ft-csh-syntax*
747747
748748 This covers the shell named "csh". Note that on some systems tcsh is actually
749749 used.
@@ -766,7 +766,7 @@
766766 variable.
767767
768768
769-CYNLIB *cynlib.vim* *cynlib-syntax*
769+CYNLIB *cynlib.vim* *ft-cynlib-syntax*
770770
771771 Cynlib files are C++ files that use the Cynlib class library to enable
772772 hardware modelling and simulation using C++. Typically Cynlib files have a .cc
@@ -786,7 +786,7 @@
786786 :unlet cynlib_cyntax_for_cpp
787787 <
788788
789-CWEB *cweb.vim* *cweb-syntax*
789+CWEB *cweb.vim* *ft-cweb-syntax*
790790
791791 Files matching "*.w" could be Progress or cweb. If the automatic detection
792792 doesn't work for you, or you don't edit Progress at all, use this in your
@@ -794,7 +794,7 @@
794794 :let filetype_w = "cweb"
795795
796796
797-DESKTOP *desktop.vim* *desktop-syntax*
797+DESKTOP *desktop.vim* *ft-desktop-syntax*
798798
799799 Primary goal of this syntax file is to highlight .desktop and .directory files
800800 according to freedesktop.org standard: http://pdx.freedesktop.org/Standards/
@@ -804,7 +804,7 @@
804804 :let enforce_freedesktop_standard = 1
805805
806806
807-DIRCOLORS *dircolors.vim* *dircolors-syntax*
807+DIRCOLORS *dircolors.vim* *ft-dircolors-syntax*
808808
809809 The dircolors utility highlighting definition has one option. It exists to
810810 provide compatibility with the Slackware GNU/Linux distributions version of
@@ -815,9 +815,9 @@
815815 let dircolors_is_slackware = 1
816816
817817
818-DOCBOOK *docbk.vim* *docbk-syntax* *docbook*
819-DOCBOOK XML *docbkxml.vim* *docbkxml-syntax*
820-DOCBOOK SGML *docbksgml.vim* *docbksgml-syntax*
818+DOCBOOK *docbk.vim* *ft-docbk-syntax* *docbook*
819+DOCBOOK XML *docbkxml.vim* *ft-docbkxml-syntax*
820+DOCBOOK SGML *docbksgml.vim* *ft-docbksgml-syntax*
821821
822822 There are two types of DocBook files: SGML and XML. To specify what type you
823823 are using the "b:docbk_type" variable should be set. Vim does this for you
@@ -834,7 +834,7 @@
834834 :set filetype=docbkxml
835835
836836
837-DOSBATCH *dosbatch.vim* *dosbatch-syntax*
837+DOSBATCH *dosbatch.vim* *ft-dosbatch-syntax*
838838
839839 There is one option with highlighting DOS batch files. This covers new
840840 extensions to the Command Interpreter introduced with Windows 2000 and
@@ -857,7 +857,7 @@
857857
858858
859859
860-DTD *dtd.vim* *dtd-syntax*
860+DTD *dtd.vim* *ft-dtd-syntax*
861861
862862 The DTD syntax highlighting is case sensitive by default. To disable
863863 case-sensitive highlighting, add the following line to your startup file: >
@@ -881,7 +881,7 @@
881881 The DTD syntax file is also included by xml.vim to highlight included dtd's.
882882
883883
884-EIFFEL *eiffel.vim* *eiffel-syntax*
884+EIFFEL *eiffel.vim* *ft-eiffel-syntax*
885885
886886 While Eiffel is not case-sensitive, its style guidelines are, and the
887887 syntax highlighting file encourages their use. This also allows to
@@ -924,7 +924,7 @@
924924 to your startup file.
925925
926926
927-ERLANG *erlang.vim* *erlang-syntax*
927+ERLANG *erlang.vim* *ft-erlang-syntax*
928928
929929 The erlang highlighting supports Erlang (ERicsson LANGuage).
930930 Erlang is case sensitive and default extension is ".erl".
@@ -939,7 +939,7 @@
939939 :let erlang_characters = 1
940940
941941
942-FORM *form.vim* *form-syntax*
942+FORM *form.vim* *ft-form-syntax*
943943
944944 The coloring scheme for syntax elements in the FORM file uses the default
945945 modes Conditional, Number, Statement, Comment, PreProc, Type, and String,
@@ -973,7 +973,7 @@
973973 conditionals are LightBlue for better distinction.
974974
975975
976-FORTRAN *fortran.vim* *fortran-syntax*
976+FORTRAN *fortran.vim* *ft-fortran-syntax*
977977
978978 Default highlighting and dialect ~
979979 Highlighting appropriate for f95 (Fortran 95) is used by default. This choice
@@ -1114,11 +1114,11 @@
11141114 strings are not recognized. Some keywords may be highlighted incorrectly
11151115 because Fortran90 has no reserved words.
11161116
1117-For further information related to fortran, see |fortran-indent| and
1118-|fortran-plugin|.
1119-
1120-
1121-FVWM CONFIGURATION FILES *fvwm.vim* *fvwm-syntax*
1117+For further information related to fortran, see |ft-fortran-indent| and
1118+|ft-fortran-plugin|.
1119+
1120+
1121+FVWM CONFIGURATION FILES *fvwm.vim* *ft-fvwm-syntax*
11221122
11231123 In order for Vim to recognize Fvwm configuration files that do not match
11241124 the patterns *fvwmrc* or *fvwm2rc* , you must put additional patterns
@@ -1142,7 +1142,7 @@
11421142 to your .vimrc file.
11431143
11441144
1145-GSP *gsp.vim*
1145+GSP *gsp.vim* *ft-gsp-syntax*
11461146
11471147 The default coloring style for GSP pages is defined by |html.vim|, and
11481148 the coloring for java code (within java tags or inline between backticks)
@@ -1165,7 +1165,7 @@
11651165 group to make them easier to see.
11661166
11671167
1168-GROFF *groff.vim* *groff-syntax*
1168+GROFF *groff.vim* *ft-groff-syntax*
11691169
11701170 The groff syntax file is a wrapper for |nroff.vim|, see the notes
11711171 under that heading for examples of use and configuration. The purpose
@@ -1174,7 +1174,7 @@
11741174 (see |filetype.txt|).
11751175
11761176
1177-HASKELL *haskell.vim* *lhaskell.vim* *haskell-syntax*
1177+HASKELL *haskell.vim* *lhaskell.vim* *ft-haskell-syntax*
11781178
11791179 The Haskell syntax files support plain Haskell code as well as literate
11801180 Haskell code, the latter in both Bird style and TeX style. The Haskell
@@ -1218,7 +1218,7 @@
12181218 loading a file.
12191219
12201220
1221-HTML *html.vim* *html-syntax*
1221+HTML *html.vim* *ft-html-syntax*
12221222
12231223 The coloring scheme for tags in the HTML file works as follows.
12241224
@@ -1291,7 +1291,7 @@
12911291 the preprocessor language to the cluster htmlPreproc.
12921292
12931293
1294-HTML/OS (by Aestiva) *htmlos.vim* *htmlos-syntax*
1294+HTML/OS (by Aestiva) *htmlos.vim* *ft-htmlos-syntax*
12951295
12961296 The coloring scheme for HTML/OS works as follows:
12971297
@@ -1312,7 +1312,7 @@
13121312 block of HTML/OS code can either be << or [[ and >> or ]], respectively.
13131313
13141314
1315-IA64 *ia64.vim* *intel-itanium* *ia64-syntax*
1315+IA64 *ia64.vim* *intel-itanium* *ft-ia64-syntax*
13161316
13171317 Highlighting for the Intel Itanium 64 assembly language. See |asm.vim| for
13181318 how to recognize this filetype.
@@ -1321,7 +1321,7 @@
13211321 :let g:filetype_inc = "ia64"
13221322
13231323
1324-INFORM *inform.vim* *inform-syntax*
1324+INFORM *inform.vim* *ft-inform-syntax*
13251325
13261326 Inform highlighting includes symbols provided by the Inform Library, as
13271327 most programs make extensive use of it. If do not wish Library symbols
@@ -1350,7 +1350,7 @@
13501350 :let inform_highlight_old=1
13511351
13521352
1353-JAVA *java.vim* *java-syntax*
1353+JAVA *java.vim* *ft-java-syntax*
13541354
13551355 The java.vim syntax highlighting file offers several options:
13561356
@@ -1443,7 +1443,7 @@
14431443 number is that redrawing can become slow.
14441444
14451445
1446-LACE *lace.vim* *lace-syntax*
1446+LACE *lace.vim* *ft-lace-syntax*
14471447
14481448 Lace (Language for Assembly of Classes in Eiffel) is case insensitive, but the
14491449 style guide lines are not. If you prefer case insensitive highlighting, just
@@ -1451,7 +1451,7 @@
14511451 :let lace_case_insensitive=1
14521452
14531453
1454-LEX *lex.vim* *lex-syntax*
1454+LEX *lex.vim* *ft-lex-syntax*
14551455
14561456 Lex uses brute-force synchronizing as the "^%%$" section delimiter
14571457 gives no clue as to what section follows. Consequently, the value for >
@@ -1460,7 +1460,7 @@
14601460 difficulties (such as may happen with large lex files).
14611461
14621462
1463-LITE *lite.vim* *lite-syntax*
1463+LITE *lite.vim* *ft-lite-syntax*
14641464
14651465 There are two options for the lite syntax highlighting.
14661466
@@ -1474,7 +1474,7 @@
14741474 :let lite_minlines = 200
14751475
14761476
1477-LPC *lpc.vim* *lpc-syntax*
1477+LPC *lpc.vim* *ft-lpc-syntax*
14781478
14791479 LPC stands for a simple, memory-efficient language: Lars Pensj| C. The
14801480 file name of LPC is usually *.c. Recognizing these files as LPC would bother
@@ -1515,7 +1515,7 @@
15151515 instead, and the name of your source file should be *.pike
15161516
15171517
1518-LUA *lua.vim* *lua-syntax*
1518+LUA *lua.vim* *ft-lua-syntax*
15191519
15201520 This syntax file may be used for Lua 4.0 and Lua 5.0 (default). If you are
15211521 programming in Lua 4.0, use this: >
@@ -1525,7 +1525,7 @@
15251525 If lua_version variable doesn't exist, it is set to 5.
15261526
15271527
1528-MAIL *mail.vim*
1528+MAIL *mail.vim* *ft-mail.vim*
15291529
15301530 Vim highlights all the standard elements of an email (headers, signatures,
15311531 quoted text and URLs / email addresses). In keeping with standard conventions,
@@ -1543,7 +1543,7 @@
15431543 :let mail_minlines = 30
15441544
15451545
1546-MAKE *make.vim* *make-syntax*
1546+MAKE *make.vim* *ft-make-syntax*
15471547
15481548 In makefiles, commands are usually highlighted to make it easy for you to spot
15491549 errors. However, this may be too much coloring for you. You can turn this
@@ -1552,7 +1552,7 @@
15521552 :let make_no_commands = 1
15531553
15541554
1555-MAPLE *maple.vim* *maple-syntax*
1555+MAPLE *maple.vim* *ft-maple-syntax*
15561556
15571557 Maple V, by Waterloo Maple Inc, supports symbolic algebra. The language
15581558 supports many packages of functions which are selectively loaded by the user.
@@ -1577,7 +1577,7 @@
15771577 mv_finance mv_logic mv_powseries
15781578
15791579
1580-MATHEMATICA *mma.vim* *mma-syntax* *mathematica-syntax*
1580+MATHEMATICA *mma.vim* *ft-mma-syntax* *ft-mathematica-syntax*
15811581
15821582 Empty *.m files will automatically be presumed to be Matlab files unless you
15831583 have the following in your .vimrc: >
@@ -1585,7 +1585,7 @@
15851585 let filetype_m = "mma"
15861586
15871587
1588-MOO *moo.vim* *moo-syntax*
1588+MOO *moo.vim* *ft-moo-syntax*
15891589
15901590 If you use C-style comments inside expressions and find it mangles your
15911591 highlighting, you may want to use extended (slow!) matches for C-style
@@ -1621,7 +1621,7 @@
16211621 :syn keyword mooKnownBuiltinFunction sprintf contained
16221622
16231623
1624-MSQL *msql.vim* *msql-syntax*
1624+MSQL *msql.vim* *ft-msql-syntax*
16251625
16261626 There are two options for the msql syntax highlighting.
16271627
@@ -1635,7 +1635,7 @@
16351635 :let msql_minlines = 200
16361636
16371637
1638-NCF *ncf.vim* *ncf-syntax*
1638+NCF *ncf.vim* *ft-ncf-syntax*
16391639
16401640 There is one option for NCF syntax highlighting.
16411641
@@ -1647,7 +1647,7 @@
16471647 If you don't want to highlight these errors, leave it unset.
16481648
16491649
1650-NROFF *nroff.vim* *nroff-syntax*
1650+NROFF *nroff.vim* *ft-nroff-syntax*
16511651
16521652 The nroff syntax file works with AT&T n/troff out of the box. You need to
16531653 activate the GNU groff extra features included in the syntax file before you
@@ -1718,7 +1718,7 @@
17181718 groff syntax highlighting either on a file basis or globally by default.
17191719
17201720
1721-OCAML *ocaml.vim* *ocaml-syntax*
1721+OCAML *ocaml.vim* *ft-ocaml-syntax*
17221722
17231723 The OCaml syntax file handles files having the following prefixes: .ml,
17241724 .mli, .mll and .mly. By setting the following variable >
@@ -1734,7 +1734,7 @@
17341734 contain very long structures that Vim does not synchronize anymore.
17351735
17361736
1737-PAPP *papp.vim* *papp-syntax*
1737+PAPP *papp.vim* *ft-papp-syntax*
17381738
17391739 The PApp syntax file handles .papp files and, to a lesser extend, .pxml
17401740 and .pxsl files which are all a mixture of perl/xml/html/other using xml
@@ -1752,7 +1752,7 @@
17521752 http://papp.plan9.de.
17531753
17541754
1755-PASCAL *pascal.vim* *pascal-syntax*
1755+PASCAL *pascal.vim* *ft-pascal-syntax*
17561756
17571757 Files matching "*.p" could be Progress or Pascal. If the automatic detection
17581758 doesn't work for you, or you don't edit Progress at all, use this in your
@@ -1806,7 +1806,7 @@
18061806
18071807
18081808
1809-PERL *perl.vim* *perl-syntax*
1809+PERL *perl.vim* *ft-perl-syntax*
18101810
18111811 There are a number of possible options to the perl syntax highlighting.
18121812
@@ -1866,7 +1866,7 @@
18661866 :let perl_fold_blocks = 1
18671867
18681868
1869-PHP3 and PHP4 *php.vim* *php3.vim* *php-syntax* *php3-syntax*
1869+PHP3 and PHP4 *php.vim* *php3.vim* *ft-php-syntax* *ft-php3-syntax*
18701870
18711871 [note: previously this was called "php3", but since it now also supports php4
18721872 it has been renamed to "php"]
@@ -1919,7 +1919,7 @@
19191919 x = 0 to sync from start.
19201920
19211921
1922-PPWIZARD *ppwiz.vim* *ppwiz-syntax*
1922+PPWIZARD *ppwiz.vim* *ft-ppwiz-syntax*
19231923
19241924 PPWizard is a preprocessor for HTML and OS/2 INF files
19251925
@@ -1941,7 +1941,7 @@
19411941 HTML code; if 0, treat HTML code like ordinary text.
19421942
19431943
1944-PHTML *phtml.vim* *phtml-syntax*
1944+PHTML *phtml.vim* *ft-phtml-syntax*
19451945
19461946 There are two options for the phtml syntax highlighting.
19471947
@@ -1955,7 +1955,7 @@
19551955 :let phtml_minlines = 200
19561956
19571957
1958-POSTSCRIPT *postscr.vim* *postscr-syntax*
1958+POSTSCRIPT *postscr.vim* *ft-postscr-syntax*
19591959
19601960 There are several options when it comes to highlighting PostScript.
19611961
@@ -2010,8 +2010,8 @@
20102010 :let postscr_andornot_binary=1
20112011 <
20122012
2013- *ptcap.vim*
2014-PRINTCAP + TERMCAP *ptcap-syntax* *termcap-syntax* *printcap-syntax*
2013+ *ptcap.vim* *ft-printcap-syntax*
2014+PRINTCAP + TERMCAP *ft-ptcap-syntax* *ft-termcap-syntax*
20152015
20162016 This syntax file applies to the printcap and termcap databases.
20172017
@@ -2036,7 +2036,7 @@
20362036 (The default is 20 lines.)
20372037
20382038
2039-PROGRESS *progress.vim* *progress-syntax*
2039+PROGRESS *progress.vim* *ft-progress-syntax*
20402040
20412041 Files matching "*.w" could be Progress or cweb. If the automatic detection
20422042 doesn't work for you, or you don't edit cweb at all, use this in your
@@ -2048,7 +2048,7 @@
20482048 :let filetype_p = "progress"
20492049
20502050
2051-PYTHON *python.vim* *python-syntax*
2051+PYTHON *python.vim* *ft-python-syntax*
20522052
20532053 There are four options to control Python syntax highlighting.
20542054
@@ -2069,7 +2069,7 @@
20692069 :let python_highlight_all = 1
20702070
20712071
2072-QUAKE *quake.vim* *quake-syntax*
2072+QUAKE *quake.vim* *ft-quake-syntax*
20732073
20742074 The Quake syntax definition should work for most any FPS (First Person
20752075 Shooter) based on one of the Quake engines. However, the command names vary
@@ -2091,7 +2091,7 @@
20912091 commands than are actually available to you by the game.
20922092
20932093
2094-READLINE *readline.vim* *readline-syntax*
2094+READLINE *readline.vim* *ft-readline-syntax*
20952095
20962096 The readline library is primarily used by the BASH shell, which adds quite a
20972097 few commands and options to the ones already available. To highlight these
@@ -2103,7 +2103,7 @@
21032103 later, and part earlier) adds.
21042104
21052105
2106-REXX *rexx.vim* *rexx-syntax*
2106+REXX *rexx.vim* *ft-rexx-syntax*
21072107
21082108 If you notice highlighting errors while scrolling backwards, which are fixed
21092109 when redrawing with CTRL-L, try setting the "rexx_minlines" internal variable
@@ -2114,7 +2114,7 @@
21142114 number is that redrawing can become slow.
21152115
21162116
2117-RUBY *ruby.vim* *ruby-syntax*
2117+RUBY *ruby.vim* *ft-ruby-syntax*
21182118
21192119 There are a few options to the Ruby syntax highlighting.
21202120
@@ -2139,7 +2139,7 @@
21392139 "$global_var", "@instance_var", "| iterator |", and ":symbol".
21402140
21412141
2142-SCHEME *scheme.vim* *scheme-syntax*
2142+SCHEME *scheme.vim* *ft-scheme-syntax*
21432143
21442144 By default only R5RS keywords are highlighted and properly indented.
21452145
@@ -2150,7 +2150,7 @@
21502150 b:is_chicken or g:is_chicken, if you need them.
21512151
21522152
2153-SDL *sdl.vim* *sdl-syntax*
2153+SDL *sdl.vim* *ft-sdl-syntax*
21542154
21552155 The SDL highlighting probably misses a few keywords, but SDL has so many
21562156 of them it's almost impossibly to cope.
@@ -2170,7 +2170,7 @@
21702170 satisfied with it for my own projects.
21712171
21722172
2173-SED *sed.vim* *sed-syntax*
2173+SED *sed.vim* *ft-sed-syntax*
21742174
21752175 To make tabs stand out from regular blanks (accomplished by using Todo
21762176 highlighting on the tabs), define "highlight_sedtabs" by putting >
@@ -2193,7 +2193,7 @@
21932193 each plausible pattern delimiter).
21942194
21952195
2196-SGML *sgml.vim* *sgml-syntax*
2196+SGML *sgml.vim* *ft-sgml-syntax*
21972197
21982198 The coloring scheme for tags in the SGML file works as follows.
21992199
@@ -2234,7 +2234,7 @@
22342234 (Adapted from the html.vim help text by Claudio Fleiner <claudio@fleiner.com>)
22352235
22362236
2237-SH *sh.vim* *sh-syntax* *bash-syntax* *ksh-syntax*
2237+SH *sh.vim* *ft-sh-syntax* *ft-bash-syntax* *ft-ksh-syntax*
22382238
22392239 This covers the "normal" Unix (Bourne) sh, bash and the Korn shell.
22402240
@@ -2285,7 +2285,7 @@
22852285 speed up displaying. The disadvantage is that highlight errors may appear.
22862286
22872287
2288-SPEEDUP (AspenTech plant simulator) *spup.vim* *spup-syntax*
2288+SPEEDUP (AspenTech plant simulator) *spup.vim* *ft-spup-syntax*
22892289
22902290 The Speedup syntax file has some options:
22912291
@@ -2317,8 +2317,8 @@
23172317 the syntax file.
23182318
23192319
2320-SQL *sql.vim* *sql-syntax*
2321- *sqlinformix.vim* *sqlinformix-syntax*
2320+SQL *sql.vim* *ft-sql-syntax*
2321+ *sqlinformix.vim* *ft-sqlinformix-syntax*
23222322
23232323 While there is an ANSI standard for SQL, most database engines add their
23242324 own custom extensions. Vim currently supports the Oracle and Informix
@@ -2328,7 +2328,7 @@
23282328 :let g:filetype_sql = "sqlinformix"
23292329
23302330
2331-TCSH *tcsh.vim* *tcsh-syntax*
2331+TCSH *tcsh.vim* *ft-tcsh-syntax*
23322332
23332333 This covers the shell named "tcsh". It is a superset of csh. See |csh.vim|
23342334 for how the filetype is detected.
@@ -2350,7 +2350,7 @@
23502350 number is that redrawing can become slow.
23512351
23522352
2353-TEX *tex.vim* *tex-syntax*
2353+TEX *tex.vim* *ft-tex-syntax*
23542354
23552355 *tex-folding*
23562356 Want Syntax Folding? ~
@@ -2425,7 +2425,7 @@
24252425 always accept such use of @.
24262426
24272427
2428-TF *tf.vim* *tf-syntax*
2428+TF *tf.vim* *ft-tf-syntax*
24292429
24302430 There is one option for the tf syntax highlighting.
24312431
@@ -2435,7 +2435,7 @@
24352435 :let tf_minlines = your choice
24362436
24372437
2438-VIM *vim.vim* *vim-syntax*
2438+VIM *vim.vim* *ft-vim-syntax*
24392439
24402440 There is a tradeoff between more accurate syntax highlighting versus
24412441 screen updating speed. To improve accuracy, you may wish to increase
@@ -2459,7 +2459,7 @@
24592459 loaded.
24602460
24612461
2462-XF86CONFIG *xf86conf.vim* *xf86conf-syntax*
2462+XF86CONFIG *xf86conf.vim* *ft-xf86conf-syntax*
24632463
24642464 The syntax of XF86Config file differs in XFree86 v3.x and v4.x. Both
24652465 variants are supported. Automatic detection is used, but is far from perfect.
@@ -2474,7 +2474,7 @@
24742474 highlighted.
24752475
24762476
2477-XML *xml.vim* *xml-syntax*
2477+XML *xml.vim* *ft-xml-syntax*
24782478
24792479 Xml namespaces are highlighted by default. This can be inhibited by
24802480 setting a global variable: >
@@ -2492,7 +2492,7 @@
24922492 especially for large files.
24932493
24942494
2495-X Pixmaps (XPM) *xpm.vim* *xpm-syntax*
2495+X Pixmaps (XPM) *xpm.vim* *ft-xpm-syntax*
24962496
24972497 xpm.vim creates its syntax items dynamically based upon the contents of the
24982498 XPM file. Thus if you make changes e.g. in the color specification strings,
diff -r 4772a5e3f9fa -r ce2181d14aa0 runtime/doc/tags
--- a/runtime/doc/tags Mon Aug 29 22:25:38 2005 +0000
+++ b/runtime/doc/tags Tue Aug 30 21:55:26 2005 +0000
@@ -1036,6 +1036,8 @@
10361036 +comments various.txt /*+comments*
10371037 +cryptv various.txt /*+cryptv*
10381038 +cscope various.txt /*+cscope*
1039++cursorshape various.txt /*+cursorshape*
1040++debug various.txt /*+debug*
10391041 +dialog_con various.txt /*+dialog_con*
10401042 +dialog_con_gui various.txt /*+dialog_con_gui*
10411043 +dialog_gui various.txt /*+dialog_gui*
@@ -1702,6 +1704,7 @@
17021704 :aun gui.txt /*:aun*
17031705 :aunmenu gui.txt /*:aunmenu*
17041706 :autocmd autocmd.txt /*:autocmd*
1707+:autocmd-verbose autocmd.txt /*:autocmd-verbose*
17051708 :b windows.txt /*:b*
17061709 :bN windows.txt /*:bN*
17071710 :bNext windows.txt /*:bNext*
@@ -4140,10 +4143,8 @@
41404143 ab motion.txt /*ab*
41414144 abandon editing.txt /*abandon*
41424145 abbreviations map.txt /*abbreviations*
4143-abel-syntax syntax.txt /*abel-syntax*
41444146 abel.vim syntax.txt /*abel.vim*
41454147 active-buffer windows.txt /*active-buffer*
4146-ada-syntax syntax.txt /*ada-syntax*
41474148 ada.vim syntax.txt /*ada.vim*
41484149 add() eval.txt /*add()*
41494150 add-filetype-plugin usr_05.txt /*add-filetype-plugin*
@@ -4176,11 +4177,9 @@
41764177 alt-input debugger.txt /*alt-input*
41774178 alternate-file editing.txt /*alternate-file*
41784179 amiga-window starting.txt /*amiga-window*
4179-ant-syntax syntax.txt /*ant-syntax*
41804180 ant.vim syntax.txt /*ant.vim*
41814181 antialias gui_x11.txt /*antialias*
41824182 ap motion.txt /*ap*
4183-apache-syntax syntax.txt /*apache-syntax*
41844183 apache.vim syntax.txt /*apache.vim*
41854184 append() eval.txt /*append()*
41864185 aquote motion.txt /*aquote*
@@ -4195,14 +4194,9 @@
41954194 argument-list editing.txt /*argument-list*
41964195 argv() eval.txt /*argv()*
41974196 as motion.txt /*as*
4198-asm-syntax syntax.txt /*asm-syntax*
41994197 asm.vim syntax.txt /*asm.vim*
42004198 asm68k syntax.txt /*asm68k*
4201-asm68k-syntax syntax.txt /*asm68k-syntax*
4202-asmh8300-syntax syntax.txt /*asmh8300-syntax*
42034199 asmh8300.vim syntax.txt /*asmh8300.vim*
4204-aspperl-syntax syntax.txt /*aspperl-syntax*
4205-aspvbs-syntax syntax.txt /*aspvbs-syntax*
42064200 at motion.txt /*at*
42074201 athena-intellimouse gui.txt /*athena-intellimouse*
42084202 attr-list syntax.txt /*attr-list*
@@ -4226,7 +4220,6 @@
42264220 autocmd-remove autocmd.txt /*autocmd-remove*
42274221 autocmd-searchpat autocmd.txt /*autocmd-searchpat*
42284222 autocmd-use autocmd.txt /*autocmd-use*
4229-autocmd-verbose autocmd.txt /*autocmd-verbose*
42304223 autocmd.txt autocmd.txt /*autocmd.txt*
42314224 autocmds-kept version5.txt /*autocmds-kept*
42324225 autocommand autocmd.txt /*autocommand*
@@ -4255,8 +4248,6 @@
42554248 bar motion.txt /*bar*
42564249 bars help.txt /*bars*
42574250 base_font_name_list mbyte.txt /*base_font_name_list*
4258-bash-syntax syntax.txt /*bash-syntax*
4259-basic-syntax syntax.txt /*basic-syntax*
42604251 basic.vim syntax.txt /*basic.vim*
42614252 beep options.txt /*beep*
42624253 beos-colors os_beos.txt /*beos-colors*
@@ -4319,7 +4310,6 @@
43194310 byteidx() eval.txt /*byteidx()*
43204311 bzip2 pi_gzip.txt /*bzip2*
43214312 c change.txt /*c*
4322-c-syntax syntax.txt /*c-syntax*
43234313 c.vim syntax.txt /*c.vim*
43244314 cW change.txt /*cW*
43254315 c_<BS> cmdline.txt /*c_<BS>*
@@ -4393,7 +4383,6 @@
43934383 catch-order eval.txt /*catch-order*
43944384 catch-text eval.txt /*catch-text*
43954385 cc change.txt /*cc*
4396-ch-syntax syntax.txt /*ch-syntax*
43974386 ch.vim syntax.txt /*ch.vim*
43984387 change-list-jumps motion.txt /*change-list-jumps*
43994388 change-tabs change.txt /*change-tabs*
@@ -4410,8 +4399,6 @@
44104399 changed-6.2 version6.txt /*changed-6.2*
44114400 changed-6.3 version6.txt /*changed-6.3*
44124401 changelist motion.txt /*changelist*
4413-changelog-plugin filetype.txt /*changelog-plugin*
4414-changelog-syntax syntax.txt /*changelog-syntax*
44154402 changelog.vim syntax.txt /*changelog.vim*
44164403 changetick eval.txt /*changetick*
44174404 changing change.txt /*changing*
@@ -4423,7 +4410,6 @@
44234410 charconvert_to-variable eval.txt /*charconvert_to-variable*
44244411 charset mbyte.txt /*charset*
44254412 charset-conversion mbyte.txt /*charset-conversion*
4426-chill-syntax syntax.txt /*chill-syntax*
44274413 chill.vim syntax.txt /*chill.vim*
44284414 cindent() eval.txt /*cindent()*
44294415 cinkeys-format indent.txt /*cinkeys-format*
@@ -4446,12 +4432,10 @@
44464432 cmdline.txt cmdline.txt /*cmdline.txt*
44474433 cmdwin cmdline.txt /*cmdwin*
44484434 cmdwin-char cmdline.txt /*cmdwin-char*
4449-cobol-syntax syntax.txt /*cobol-syntax*
44504435 cobol.vim syntax.txt /*cobol.vim*
44514436 codeset mbyte.txt /*codeset*
44524437 coding-style develop.txt /*coding-style*
44534438 col() eval.txt /*col()*
4454-coldfusion-syntax syntax.txt /*coldfusion-syntax*
44554439 coldfusion.vim syntax.txt /*coldfusion.vim*
44564440 collapse tips.txt /*collapse*
44574441 color-xterm syntax.txt /*color-xterm*
@@ -4583,7 +4567,6 @@
45834567 cscopetag if_cscop.txt /*cscopetag*
45844568 cscopetagorder if_cscop.txt /*cscopetagorder*
45854569 cscopeverbose if_cscop.txt /*cscopeverbose*
4586-csh-syntax syntax.txt /*csh-syntax*
45874570 csh.vim syntax.txt /*csh.vim*
45884571 cspc if_cscop.txt /*cspc*
45894572 csprg if_cscop.txt /*csprg*
@@ -4615,9 +4598,7 @@
46154598 cursor_right intro.txt /*cursor_right*
46164599 cursor_up intro.txt /*cursor_up*
46174600 cw change.txt /*cw*
4618-cweb-syntax syntax.txt /*cweb-syntax*
46194601 cweb.vim syntax.txt /*cweb.vim*
4620-cynlib-syntax syntax.txt /*cynlib-syntax*
46214602 cynlib.vim syntax.txt /*cynlib.vim*
46224603 d change.txt /*d*
46234604 daB motion.txt /*daB*
@@ -4657,7 +4638,6 @@
46574638 design-multi-platform develop.txt /*design-multi-platform*
46584639 design-not develop.txt /*design-not*
46594640 design-speed-size develop.txt /*design-speed-size*
4660-desktop-syntax syntax.txt /*desktop-syntax*
46614641 desktop.vim syntax.txt /*desktop.vim*
46624642 develop-spell develop.txt /*develop-spell*
46634643 develop.txt develop.txt /*develop.txt*
@@ -4689,7 +4669,6 @@
46894669 digraphs-define digraph.txt /*digraphs-define*
46904670 digraphs-use digraph.txt /*digraphs-use*
46914671 dip motion.txt /*dip*
4692-dircolors-syntax syntax.txt /*dircolors-syntax*
46934672 dircolors.vim syntax.txt /*dircolors.vim*
46944673 dis motion.txt /*dis*
46954674 disable-menus gui.txt /*disable-menus*
@@ -4698,11 +4677,8 @@
46984677 dl change.txt /*dl*
46994678 do diff.txt /*do*
47004679 doc-file-list help.txt /*doc-file-list*
4701-docbk-syntax syntax.txt /*docbk-syntax*
47024680 docbk.vim syntax.txt /*docbk.vim*
4703-docbksgml-syntax syntax.txt /*docbksgml-syntax*
47044681 docbksgml.vim syntax.txt /*docbksgml.vim*
4705-docbkxml-syntax syntax.txt /*docbkxml-syntax*
47064682 docbkxml.vim syntax.txt /*docbkxml.vim*
47074683 docbook syntax.txt /*docbook*
47084684 documentation-6 version6.txt /*documentation-6*
@@ -4719,7 +4695,6 @@
47194695 dos-temp-files os_dos.txt /*dos-temp-files*
47204696 dos16 os_msdos.txt /*dos16*
47214697 dos32 os_msdos.txt /*dos32*
4722-dosbatch-syntax syntax.txt /*dosbatch-syntax*
47234698 dosbatch.vim syntax.txt /*dosbatch.vim*
47244699 double-click term.txt /*double-click*
47254700 download intro.txt /*download*
@@ -4727,7 +4702,6 @@
47274702 drag-n-drop gui.txt /*drag-n-drop*
47284703 drag-n-drop-win32 gui_w32.txt /*drag-n-drop-win32*
47294704 drag-status-line term.txt /*drag-status-line*
4730-dtd-syntax syntax.txt /*dtd-syntax*
47314705 dtd.vim syntax.txt /*dtd.vim*
47324706 dying-variable eval.txt /*dying-variable*
47334707 e motion.txt /*e*
@@ -4741,7 +4715,6 @@
47414715 editing.txt editing.txt /*editing.txt*
47424716 efm-entries quickfix.txt /*efm-entries*
47434717 efm-ignore quickfix.txt /*efm-ignore*
4744-eiffel-syntax syntax.txt /*eiffel-syntax*
47454718 eiffel.vim syntax.txt /*eiffel.vim*
47464719 emacs-keys tips.txt /*emacs-keys*
47474720 emacs-tags tagsrch.txt /*emacs-tags*
@@ -4754,7 +4727,6 @@
47544727 end intro.txt /*end*
47554728 end-of-file pattern.txt /*end-of-file*
47564729 enlightened-terminal syntax.txt /*enlightened-terminal*
4757-erlang-syntax syntax.txt /*erlang-syntax*
47584730 erlang.vim syntax.txt /*erlang.vim*
47594731 errmsg-variable eval.txt /*errmsg-variable*
47604732 error-file-format quickfix.txt /*error-file-format*
@@ -4964,18 +4936,114 @@
49644936 fontset mbyte.txt /*fontset*
49654937 foreground() eval.txt /*foreground()*
49664938 fork os_unix.txt /*fork*
4967-form-syntax syntax.txt /*form-syntax*
49684939 form.vim syntax.txt /*form.vim*
49694940 format-bullet-list tips.txt /*format-bullet-list*
49704941 format-comments change.txt /*format-comments*
49714942 formatting change.txt /*formatting*
49724943 formfeed intro.txt /*formfeed*
4973-fortran-indent indent.txt /*fortran-indent*
4974-fortran-plugin filetype.txt /*fortran-plugin*
4975-fortran-syntax syntax.txt /*fortran-syntax*
49764944 fortran.vim syntax.txt /*fortran.vim*
49774945 french-maillist intro.txt /*french-maillist*
49784946 frombook usr_01.txt /*frombook*
4947+ft-abel-syntax syntax.txt /*ft-abel-syntax*
4948+ft-ada-syntax syntax.txt /*ft-ada-syntax*
4949+ft-ant-syntax syntax.txt /*ft-ant-syntax*
4950+ft-apache-syntax syntax.txt /*ft-apache-syntax*
4951+ft-asm-syntax syntax.txt /*ft-asm-syntax*
4952+ft-asm68k-syntax syntax.txt /*ft-asm68k-syntax*
4953+ft-asmh8300-syntax syntax.txt /*ft-asmh8300-syntax*
4954+ft-aspperl-syntax syntax.txt /*ft-aspperl-syntax*
4955+ft-aspvbs-syntax syntax.txt /*ft-aspvbs-syntax*
4956+ft-bash-syntax syntax.txt /*ft-bash-syntax*
4957+ft-basic-syntax syntax.txt /*ft-basic-syntax*
4958+ft-c-syntax syntax.txt /*ft-c-syntax*
4959+ft-ch-syntax syntax.txt /*ft-ch-syntax*
4960+ft-changelog-plugin filetype.txt /*ft-changelog-plugin*
4961+ft-changelog-syntax syntax.txt /*ft-changelog-syntax*
4962+ft-chill-syntax syntax.txt /*ft-chill-syntax*
4963+ft-cobol-syntax syntax.txt /*ft-cobol-syntax*
4964+ft-coldfusion-syntax syntax.txt /*ft-coldfusion-syntax*
4965+ft-csh-syntax syntax.txt /*ft-csh-syntax*
4966+ft-cweb-syntax syntax.txt /*ft-cweb-syntax*
4967+ft-cynlib-syntax syntax.txt /*ft-cynlib-syntax*
4968+ft-desktop-syntax syntax.txt /*ft-desktop-syntax*
4969+ft-dircolors-syntax syntax.txt /*ft-dircolors-syntax*
4970+ft-docbk-syntax syntax.txt /*ft-docbk-syntax*
4971+ft-docbksgml-syntax syntax.txt /*ft-docbksgml-syntax*
4972+ft-docbkxml-syntax syntax.txt /*ft-docbkxml-syntax*
4973+ft-dosbatch-syntax syntax.txt /*ft-dosbatch-syntax*
4974+ft-dtd-syntax syntax.txt /*ft-dtd-syntax*
4975+ft-eiffel-syntax syntax.txt /*ft-eiffel-syntax*
4976+ft-erlang-syntax syntax.txt /*ft-erlang-syntax*
4977+ft-form-syntax syntax.txt /*ft-form-syntax*
4978+ft-fortran-indent indent.txt /*ft-fortran-indent*
4979+ft-fortran-plugin filetype.txt /*ft-fortran-plugin*
4980+ft-fortran-syntax syntax.txt /*ft-fortran-syntax*
4981+ft-fvwm-syntax syntax.txt /*ft-fvwm-syntax*
4982+ft-groff-syntax syntax.txt /*ft-groff-syntax*
4983+ft-gsp-syntax syntax.txt /*ft-gsp-syntax*
4984+ft-haskell-syntax syntax.txt /*ft-haskell-syntax*
4985+ft-html-syntax syntax.txt /*ft-html-syntax*
4986+ft-htmlos-syntax syntax.txt /*ft-htmlos-syntax*
4987+ft-ia64-syntax syntax.txt /*ft-ia64-syntax*
4988+ft-inform-syntax syntax.txt /*ft-inform-syntax*
4989+ft-java-syntax syntax.txt /*ft-java-syntax*
4990+ft-ksh-syntax syntax.txt /*ft-ksh-syntax*
4991+ft-lace-syntax syntax.txt /*ft-lace-syntax*
4992+ft-lex-syntax syntax.txt /*ft-lex-syntax*
4993+ft-lite-syntax syntax.txt /*ft-lite-syntax*
4994+ft-lpc-syntax syntax.txt /*ft-lpc-syntax*
4995+ft-lua-syntax syntax.txt /*ft-lua-syntax*
4996+ft-mail-plugin filetype.txt /*ft-mail-plugin*
4997+ft-mail.vim syntax.txt /*ft-mail.vim*
4998+ft-make-syntax syntax.txt /*ft-make-syntax*
4999+ft-man-plugin filetype.txt /*ft-man-plugin*
5000+ft-maple-syntax syntax.txt /*ft-maple-syntax*
5001+ft-masm-syntax syntax.txt /*ft-masm-syntax*
5002+ft-mathematica-syntax syntax.txt /*ft-mathematica-syntax*
5003+ft-mma-syntax syntax.txt /*ft-mma-syntax*
5004+ft-moo-syntax syntax.txt /*ft-moo-syntax*
5005+ft-msql-syntax syntax.txt /*ft-msql-syntax*
5006+ft-nasm-syntax syntax.txt /*ft-nasm-syntax*
5007+ft-ncf-syntax syntax.txt /*ft-ncf-syntax*
5008+ft-nroff-syntax syntax.txt /*ft-nroff-syntax*
5009+ft-ocaml-syntax syntax.txt /*ft-ocaml-syntax*
5010+ft-papp-syntax syntax.txt /*ft-papp-syntax*
5011+ft-pascal-syntax syntax.txt /*ft-pascal-syntax*
5012+ft-perl-syntax syntax.txt /*ft-perl-syntax*
5013+ft-php-syntax syntax.txt /*ft-php-syntax*
5014+ft-php3-syntax syntax.txt /*ft-php3-syntax*
5015+ft-phtml-syntax syntax.txt /*ft-phtml-syntax*
5016+ft-postscr-syntax syntax.txt /*ft-postscr-syntax*
5017+ft-ppwiz-syntax syntax.txt /*ft-ppwiz-syntax*
5018+ft-printcap-syntax syntax.txt /*ft-printcap-syntax*
5019+ft-progress-syntax syntax.txt /*ft-progress-syntax*
5020+ft-ptcap-syntax syntax.txt /*ft-ptcap-syntax*
5021+ft-python-indent indent.txt /*ft-python-indent*
5022+ft-python-syntax syntax.txt /*ft-python-syntax*
5023+ft-quake-syntax syntax.txt /*ft-quake-syntax*
5024+ft-readline-syntax syntax.txt /*ft-readline-syntax*
5025+ft-rexx-syntax syntax.txt /*ft-rexx-syntax*
5026+ft-ruby-syntax syntax.txt /*ft-ruby-syntax*
5027+ft-scheme-syntax syntax.txt /*ft-scheme-syntax*
5028+ft-sdl-syntax syntax.txt /*ft-sdl-syntax*
5029+ft-sed-syntax syntax.txt /*ft-sed-syntax*
5030+ft-sgml-syntax syntax.txt /*ft-sgml-syntax*
5031+ft-sh-syntax syntax.txt /*ft-sh-syntax*
5032+ft-spec-plugin filetype.txt /*ft-spec-plugin*
5033+ft-spup-syntax syntax.txt /*ft-spup-syntax*
5034+ft-sql-syntax syntax.txt /*ft-sql-syntax*
5035+ft-sqlinformix-syntax syntax.txt /*ft-sqlinformix-syntax*
5036+ft-tcsh-syntax syntax.txt /*ft-tcsh-syntax*
5037+ft-termcap-syntax syntax.txt /*ft-termcap-syntax*
5038+ft-tex-syntax syntax.txt /*ft-tex-syntax*
5039+ft-tf-syntax syntax.txt /*ft-tf-syntax*
5040+ft-vb-syntax syntax.txt /*ft-vb-syntax*
5041+ft-verilog-indent indent.txt /*ft-verilog-indent*
5042+ft-vim-indent indent.txt /*ft-vim-indent*
5043+ft-vim-syntax syntax.txt /*ft-vim-syntax*
5044+ft-xf86conf-syntax syntax.txt /*ft-xf86conf-syntax*
5045+ft-xml-syntax syntax.txt /*ft-xml-syntax*
5046+ft-xpm-syntax syntax.txt /*ft-xpm-syntax*
49795047 ftdetect filetype.txt /*ftdetect*
49805048 ftp pi_netrw.txt /*ftp*
49815049 ftplugin usr_41.txt /*ftplugin*
@@ -4991,7 +5059,6 @@
49915059 function-range-example eval.txt /*function-range-example*
49925060 function_key intro.txt /*function_key*
49935061 functions eval.txt /*functions*
4994-fvwm-syntax syntax.txt /*fvwm-syntax*
49955062 fvwm.vim syntax.txt /*fvwm.vim*
49965063 fvwm2rc syntax.txt /*fvwm2rc*
49975064 fvwmrc syntax.txt /*fvwmrc*
@@ -5125,7 +5192,6 @@
51255192 graphic-option-gone version4.txt /*graphic-option-gone*
51265193 greek options.txt /*greek*
51275194 grep quickfix.txt /*grep*
5128-groff-syntax syntax.txt /*groff-syntax*
51295195 groff.vim syntax.txt /*groff.vim*
51305196 group-name syntax.txt /*group-name*
51315197 gs various.txt /*gs*
@@ -5213,13 +5279,13 @@
52135279 has() eval.txt /*has()*
52145280 has-patch eval.txt /*has-patch*
52155281 has_key() eval.txt /*has_key()*
5216-haskell-syntax syntax.txt /*haskell-syntax*
52175282 haskell.vim syntax.txt /*haskell.vim*
52185283 hasmapto() eval.txt /*hasmapto()*
52195284 hebrew hebrew.txt /*hebrew*
52205285 hebrew.txt hebrew.txt /*hebrew.txt*
52215286 help various.txt /*help*
52225287 help-context help.txt /*help-context*
5288+help-tags tags 1
52235289 help-translated various.txt /*help-translated*
52245290 help-xterm-window various.txt /*help-xterm-window*
52255291 help.txt help.txt /*help.txt*
@@ -5307,9 +5373,7 @@
53075373 howto.txt howto.txt /*howto.txt*
53085374 hpterm term.txt /*hpterm*
53095375 hpterm-color syntax.txt /*hpterm-color*
5310-html-syntax syntax.txt /*html-syntax*
53115376 html.vim syntax.txt /*html.vim*
5312-htmlos-syntax syntax.txt /*htmlos-syntax*
53135377 htmlos.vim syntax.txt /*htmlos.vim*
53145378 http pi_netrw.txt /*http*
53155379 i insert.txt /*i*
@@ -5420,7 +5484,6 @@
54205484 i_digraph digraph.txt /*i_digraph*
54215485 i_esc intro.txt /*i_esc*
54225486 i` motion.txt /*i`*
5423-ia64-syntax syntax.txt /*ia64-syntax*
54245487 ia64.vim syntax.txt /*ia64.vim*
54255488 ib motion.txt /*ib*
54265489 iccf uganda.txt /*iccf*
@@ -5460,7 +5523,6 @@
54605523 index() eval.txt /*index()*
54615524 index.txt index.txt /*index.txt*
54625525 info-message starting.txt /*info-message*
5463-inform-syntax syntax.txt /*inform-syntax*
54645526 inform.vim syntax.txt /*inform.vim*
54655527 initialization starting.txt /*initialization*
54665528 input() eval.txt /*input()*
@@ -5511,7 +5573,6 @@
55115573 j motion.txt /*j*
55125574 java-cinoptions indent.txt /*java-cinoptions*
55135575 java-indenting indent.txt /*java-indenting*
5514-java-syntax syntax.txt /*java-syntax*
55155576 java.vim syntax.txt /*java.vim*
55165577 join() eval.txt /*join()*
55175578 jsbterm-mouse options.txt /*jsbterm-mouse*
@@ -5546,10 +5607,8 @@
55465607 keypad-point intro.txt /*keypad-point*
55475608 keys() eval.txt /*keys()*
55485609 known-bugs todo.txt /*known-bugs*
5549-ksh-syntax syntax.txt /*ksh-syntax*
55505610 l motion.txt /*l*
55515611 l:var eval.txt /*l:var*
5552-lace-syntax syntax.txt /*lace-syntax*
55535612 lace.vim syntax.txt /*lace.vim*
55545613 lang-variable eval.txt /*lang-variable*
55555614 language-mapping map.txt /*language-mapping*
@@ -5561,7 +5620,6 @@
55615620 len() eval.txt /*len()*
55625621 less various.txt /*less*
55635622 letter print.txt /*letter*
5564-lex-syntax syntax.txt /*lex-syntax*
55655623 lex.vim syntax.txt /*lex.vim*
55665624 lhaskell.vim syntax.txt /*lhaskell.vim*
55675625 libcall() eval.txt /*libcall()*
@@ -5581,7 +5639,6 @@
55815639 list-index eval.txt /*list-index*
55825640 list-modification eval.txt /*list-modification*
55835641 list-repeat windows.txt /*list-repeat*
5584-lite-syntax syntax.txt /*lite-syntax*
55855642 lite.vim syntax.txt /*lite.vim*
55865643 literal-string eval.txt /*literal-string*
55875644 lnum-variable eval.txt /*lnum-variable*
@@ -5597,9 +5654,7 @@
55975654 localtime() eval.txt /*localtime()*
55985655 long-lines version5.txt /*long-lines*
55995656 lowercase change.txt /*lowercase*
5600-lpc-syntax syntax.txt /*lpc-syntax*
56015657 lpc.vim syntax.txt /*lpc.vim*
5602-lua-syntax syntax.txt /*lua-syntax*
56035658 lua.vim syntax.txt /*lua.vim*
56045659 m motion.txt /*m*
56055660 m' motion.txt /*m'*
@@ -5616,13 +5671,10 @@
56165671 macintosh os_mac.txt /*macintosh*
56175672 macro map.txt /*macro*
56185673 mail-list intro.txt /*mail-list*
5619-mail-plugin filetype.txt /*mail-plugin*
56205674 mail.vim syntax.txt /*mail.vim*
56215675 maillist intro.txt /*maillist*
56225676 maillist-archive intro.txt /*maillist-archive*
5623-make-syntax syntax.txt /*make-syntax*
56245677 make.vim syntax.txt /*make.vim*
5625-man-plugin filetype.txt /*man-plugin*
56265678 manual-copyright usr_01.txt /*manual-copyright*
56275679 map() eval.txt /*map()*
56285680 map-<SID> map.txt /*map-<SID>*
@@ -5648,14 +5700,12 @@
56485700 map_space_in_rhs map.txt /*map_space_in_rhs*
56495701 maparg() eval.txt /*maparg()*
56505702 mapcheck() eval.txt /*mapcheck()*
5651-maple-syntax syntax.txt /*maple-syntax*
56525703 maple.vim syntax.txt /*maple.vim*
56535704 mapleader map.txt /*mapleader*
56545705 maplocalleader map.txt /*maplocalleader*
56555706 mapping map.txt /*mapping*
56565707 mark motion.txt /*mark*
56575708 mark-motions motion.txt /*mark-motions*
5658-masm-syntax syntax.txt /*masm-syntax*
56595709 masm.vim syntax.txt /*masm.vim*
56605710 match() eval.txt /*match()*
56615711 match-highlight pattern.txt /*match-highlight*
@@ -5663,7 +5713,6 @@
56635713 matchit-install usr_05.txt /*matchit-install*
56645714 matchlist() eval.txt /*matchlist()*
56655715 matchstr() eval.txt /*matchstr()*
5666-mathematica-syntax syntax.txt /*mathematica-syntax*
56675716 max() eval.txt /*max()*
56685717 mbyte-IME mbyte.txt /*mbyte-IME*
56695718 mbyte-XIM mbyte.txt /*mbyte-XIM*
@@ -5693,7 +5742,6 @@
56935742 missing-options vi_diff.txt /*missing-options*
56945743 mkdir() eval.txt /*mkdir()*
56955744 mlang.txt mlang.txt /*mlang.txt*
5696-mma-syntax syntax.txt /*mma-syntax*
56975745 mma.vim syntax.txt /*mma.vim*
56985746 mode() eval.txt /*mode()*
56995747 mode-Ex intro.txt /*mode-Ex*
@@ -5706,7 +5754,6 @@
57065754 modeline options.txt /*modeline*
57075755 modeline-local options.txt /*modeline-local*
57085756 modeline-version options.txt /*modeline-version*
5709-moo-syntax syntax.txt /*moo-syntax*
57105757 moo.vim syntax.txt /*moo.vim*
57115758 more-compatible version5.txt /*more-compatible*
57125759 more-prompt message.txt /*more-prompt*
@@ -5731,7 +5778,6 @@
57315778 msdos-problems os_msdos.txt /*msdos-problems*
57325779 msdos-termcap os_msdos.txt /*msdos-termcap*
57335780 msdos-versions os_msdos.txt /*msdos-versions*
5734-msql-syntax syntax.txt /*msql-syntax*
57355781 msql.vim syntax.txt /*msql.vim*
57365782 mswin.vim gui_w32.txt /*mswin.vim*
57375783 multi-byte mbyte.txt /*multi-byte*
@@ -5759,7 +5805,6 @@
57595805 mzscheme-vimext if_mzsch.txt /*mzscheme-vimext*
57605806 mzscheme-window if_mzsch.txt /*mzscheme-window*
57615807 n pattern.txt /*n*
5762-nasm-syntax syntax.txt /*nasm-syntax*
57635808 nasm.vim syntax.txt /*nasm.vim*
57645809 navigation motion.txt /*navigation*
57655810 nb-commands netbeans.txt /*nb-commands*
@@ -5768,7 +5813,6 @@
57685813 nb-messages netbeans.txt /*nb-messages*
57695814 nb-special netbeans.txt /*nb-special*
57705815 nb-terms netbeans.txt /*nb-terms*
5771-ncf-syntax syntax.txt /*ncf-syntax*
57725816 ncf.vim syntax.txt /*ncf.vim*
57735817 netbeans netbeans.txt /*netbeans*
57745818 netbeans-commands netbeans.txt /*netbeans-commands*
@@ -5792,6 +5836,7 @@
57925836 netrw-R pi_netrw.txt /*netrw-R*
57935837 netrw-S pi_netrw.txt /*netrw-S*
57945838 netrw-U pi_netrw.txt /*netrw-U*
5839+netrw-a pi_netrw.txt /*netrw-a*
57955840 netrw-activate pi_netrw.txt /*netrw-activate*
57965841 netrw-b pi_netrw.txt /*netrw-b*
57975842 netrw-bookmark pi_netrw.txt /*netrw-bookmark*
@@ -5830,8 +5875,8 @@
58305875 netrw-horiz pi_netrw.txt /*netrw-horiz*
58315876 netrw-i pi_netrw.txt /*netrw-i*
58325877 netrw-list pi_netrw.txt /*netrw-list*
5878+netrw-list-hack pi_netrw.txt /*netrw-list-hack*
58335879 netrw-listbookmark pi_netrw.txt /*netrw-listbookmark*
5834-netrw-listhack pi_netrw.txt /*netrw-listhack*
58355880 netrw-maps pi_netrw.txt /*netrw-maps*
58365881 netrw-move pi_netrw.txt /*netrw-move*
58375882 netrw-netrc pi_netrw.txt /*netrw-netrc*
@@ -5955,7 +6000,6 @@
59556000 notation intro.txt /*notation*
59566001 notepad gui_w32.txt /*notepad*
59576002 nr2char() eval.txt /*nr2char()*
5958-nroff-syntax syntax.txt /*nroff-syntax*
59596003 nroff.vim syntax.txt /*nroff.vim*
59606004 numbered-function eval.txt /*numbered-function*
59616005 o insert.txt /*o*
@@ -5966,7 +6010,6 @@
59666010 object-select motion.txt /*object-select*
59676011 objects index.txt /*objects*
59686012 obtaining-exted netbeans.txt /*obtaining-exted*
5969-ocaml-syntax syntax.txt /*ocaml-syntax*
59706013 ocaml.vim syntax.txt /*ocaml.vim*
59716014 ole-activation if_ole.txt /*ole-activation*
59726015 ole-eval if_ole.txt /*ole-eval*
@@ -6009,10 +6052,8 @@
60096052 page_down intro.txt /*page_down*
60106053 page_up intro.txt /*page_up*
60116054 pager message.txt /*pager*
6012-papp-syntax syntax.txt /*papp-syntax*
60136055 papp.vim syntax.txt /*papp.vim*
60146056 paragraph motion.txt /*paragraph*
6015-pascal-syntax syntax.txt /*pascal-syntax*
60166057 pascal.vim syntax.txt /*pascal.vim*
60176058 pattern pattern.txt /*pattern*
60186059 pattern-atoms pattern.txt /*pattern-atoms*
@@ -6044,7 +6085,6 @@
60446085 perl-editing if_perl.txt /*perl-editing*
60456086 perl-overview if_perl.txt /*perl-overview*
60466087 perl-patterns pattern.txt /*perl-patterns*
6047-perl-syntax syntax.txt /*perl-syntax*
60486088 perl-using if_perl.txt /*perl-using*
60496089 perl.vim syntax.txt /*perl.vim*
60506090 pexpr-option print.txt /*pexpr-option*
@@ -6052,11 +6092,8 @@
60526092 pheader-option print.txt /*pheader-option*
60536093 photon-fonts os_qnx.txt /*photon-fonts*
60546094 photon-gui os_qnx.txt /*photon-gui*
6055-php-syntax syntax.txt /*php-syntax*
60566095 php.vim syntax.txt /*php.vim*
6057-php3-syntax syntax.txt /*php3-syntax*
60586096 php3.vim syntax.txt /*php3.vim*
6059-phtml-syntax syntax.txt /*phtml-syntax*
60606097 phtml.vim syntax.txt /*phtml.vim*
60616098 pi_gzip.txt pi_gzip.txt /*pi_gzip.txt*
60626099 pi_netrw.txt pi_netrw.txt /*pi_netrw.txt*
@@ -6075,14 +6112,12 @@
60756112 posix vi_diff.txt /*posix*
60766113 posix-compliance vi_diff.txt /*posix-compliance*
60776114 posix-screen-size vi_diff.txt /*posix-screen-size*
6078-postscr-syntax syntax.txt /*postscr-syntax*
60796115 postscr.vim syntax.txt /*postscr.vim*
60806116 postscript-cjk-printing print.txt /*postscript-cjk-printing*
60816117 postscript-print-encoding print.txt /*postscript-print-encoding*
60826118 postscript-print-trouble print.txt /*postscript-print-trouble*
60836119 postscript-print-util print.txt /*postscript-print-util*
60846120 postscript-printing print.txt /*postscript-printing*
6085-ppwiz-syntax syntax.txt /*ppwiz-syntax*
60866121 ppwiz.vim syntax.txt /*ppwiz.vim*
60876122 press-enter message.txt /*press-enter*
60886123 press-return message.txt /*press-return*
@@ -6092,7 +6127,6 @@
60926127 print-intro print.txt /*print-intro*
60936128 print-options print.txt /*print-options*
60946129 print.txt print.txt /*print.txt*
6095-printcap-syntax syntax.txt /*printcap-syntax*
60966130 printf() eval.txt /*printf()*
60976131 printing print.txt /*printing*
60986132 printing-formfeed print.txt /*printing-formfeed*
@@ -6100,9 +6134,7 @@
61006134 profiling repeat.txt /*profiling*
61016135 profiling-variable eval.txt /*profiling-variable*
61026136 progname-variable eval.txt /*progname-variable*
6103-progress-syntax syntax.txt /*progress-syntax*
61046137 progress.vim syntax.txt /*progress.vim*
6105-ptcap-syntax syntax.txt /*ptcap-syntax*
61066138 ptcap.vim syntax.txt /*ptcap.vim*
61076139 pterm-mouse options.txt /*pterm-mouse*
61086140 put change.txt /*put*
@@ -6116,11 +6148,9 @@
61166148 python-error if_pyth.txt /*python-error*
61176149 python-eval if_pyth.txt /*python-eval*
61186150 python-examples if_pyth.txt /*python-examples*
6119-python-indent indent.txt /*python-indent*
61206151 python-input if_pyth.txt /*python-input*
61216152 python-output if_pyth.txt /*python-output*
61226153 python-range if_pyth.txt /*python-range*
6123-python-syntax syntax.txt /*python-syntax*
61246154 python-vim if_pyth.txt /*python-vim*
61256155 python-window if_pyth.txt /*python-window*
61266156 python-windows if_pyth.txt /*python-windows*
@@ -6133,7 +6163,6 @@
61336163 qnx-compiling os_qnx.txt /*qnx-compiling*
61346164 qnx-general os_qnx.txt /*qnx-general*
61356165 qnx-terminal os_qnx.txt /*qnx-terminal*
6136-quake-syntax syntax.txt /*quake-syntax*
61376166 quake.vim syntax.txt /*quake.vim*
61386167 quickfix quickfix.txt /*quickfix*
61396168 quickfix-6 version6.txt /*quickfix-6*
@@ -6188,7 +6217,6 @@
61886217 read-only-share editing.txt /*read-only-share*
61896218 read-stdin version5.txt /*read-stdin*
61906219 readfile() eval.txt /*readfile()*
6191-readline-syntax syntax.txt /*readline-syntax*
61926220 readline.vim syntax.txt /*readline.vim*
61936221 recording repeat.txt /*recording*
61946222 recover.txt recover.txt /*recover.txt*
@@ -6227,7 +6255,6 @@
62276255 retab-example change.txt /*retab-example*
62286256 rethrow eval.txt /*rethrow*
62296257 reverse() eval.txt /*reverse()*
6230-rexx-syntax syntax.txt /*rexx-syntax*
62316258 rexx.vim syntax.txt /*rexx.vim*
62326259 rgb.txt gui_w32.txt /*rgb.txt*
62336260 rgview starting.txt /*rgview*
@@ -6257,7 +6284,6 @@
62576284 ruby-globals if_ruby.txt /*ruby-globals*
62586285 ruby-message if_ruby.txt /*ruby-message*
62596286 ruby-set_option if_ruby.txt /*ruby-set_option*
6260-ruby-syntax syntax.txt /*ruby-syntax*
62616287 ruby-vim if_ruby.txt /*ruby-vim*
62626288 ruby-window if_ruby.txt /*ruby-window*
62636289 ruby.vim syntax.txt /*ruby.vim*
@@ -6297,7 +6323,6 @@
62976323 sandbox eval.txt /*sandbox*
62986324 save-file editing.txt /*save-file*
62996325 save-settings starting.txt /*save-settings*
6300-scheme-syntax syntax.txt /*scheme-syntax*
63016326 scheme.vim syntax.txt /*scheme.vim*
63026327 scp pi_netrw.txt /*scp*
63036328 script usr_41.txt /*script*
@@ -6318,7 +6343,6 @@
63186343 scrollbind-quickadj scroll.txt /*scrollbind-quickadj*
63196344 scrollbind-relative scroll.txt /*scrollbind-relative*
63206345 scrolling scroll.txt /*scrolling*
6321-sdl-syntax syntax.txt /*sdl-syntax*
63226346 sdl.vim syntax.txt /*sdl.vim*
63236347 search() eval.txt /*search()*
63246348 search-commands pattern.txt /*search-commands*
@@ -6328,7 +6352,6 @@
63286352 search-replace change.txt /*search-replace*
63296353 searchpair() eval.txt /*searchpair()*
63306354 section motion.txt /*section*
6331-sed-syntax syntax.txt /*sed-syntax*
63326355 sed.vim syntax.txt /*sed.vim*
63336356 self eval.txt /*self*
63346357 send-money sponsor.txt /*send-money*
@@ -6349,9 +6372,7 @@
63496372 setting-guifont gui.txt /*setting-guifont*
63506373 setwinvar() eval.txt /*setwinvar()*
63516374 sftp pi_netrw.txt /*sftp*
6352-sgml-syntax syntax.txt /*sgml-syntax*
63536375 sgml.vim syntax.txt /*sgml.vim*
6354-sh-syntax syntax.txt /*sh-syntax*
63556376 sh.vim syntax.txt /*sh.vim*
63566377 shell-window tips.txt /*shell-window*
63576378 shell_error-variable eval.txt /*shell_error-variable*
@@ -6382,7 +6403,6 @@
63826403 space intro.txt /*space*
63836404 spec-customizing pi_spec.txt /*spec-customizing*
63846405 spec-how-to-use-it pi_spec.txt /*spec-how-to-use-it*
6385-spec-plugin filetype.txt /*spec-plugin*
63866406 spec-setting-a-map pi_spec.txt /*spec-setting-a-map*
63876407 spec_chglog_format pi_spec.txt /*spec_chglog_format*
63886408 spec_chglog_prepend pi_spec.txt /*spec_chglog_prepend*
@@ -6397,11 +6417,13 @@
63976417 spell-COMPOUNDMAX spell.txt /*spell-COMPOUNDMAX*
63986418 spell-COMPOUNDMIN spell.txt /*spell-COMPOUNDMIN*
63996419 spell-COMPOUNDSYLMAX spell.txt /*spell-COMPOUNDSYLMAX*
6420+spell-FLAG spell.txt /*spell-FLAG*
64006421 spell-FOL spell.txt /*spell-FOL*
64016422 spell-KEP spell.txt /*spell-KEP*
64026423 spell-LOW spell.txt /*spell-LOW*
64036424 spell-MAP spell.txt /*spell-MAP*
64046425 spell-NEEDAFFIX spell.txt /*spell-NEEDAFFIX*
6426+spell-NEEDCOMPOUND spell.txt /*spell-NEEDCOMPOUND*
64056427 spell-NOBREAK spell.txt /*spell-NOBREAK*
64066428 spell-PFX spell.txt /*spell-PFX*
64076429 spell-PFXPOSTPONE spell.txt /*spell-PFXPOSTPONE*
@@ -6442,11 +6464,8 @@
64426464 sponsor-faq sponsor.txt /*sponsor-faq*
64436465 sponsor.txt sponsor.txt /*sponsor.txt*
64446466 spoon os_unix.txt /*spoon*
6445-spup-syntax syntax.txt /*spup-syntax*
64466467 spup.vim syntax.txt /*spup.vim*
6447-sql-syntax syntax.txt /*sql-syntax*
64486468 sql.vim syntax.txt /*sql.vim*
6449-sqlinformix-syntax syntax.txt /*sqlinformix-syntax*
64506469 sqlinformix.vim syntax.txt /*sqlinformix.vim*
64516470 sscanf eval.txt /*sscanf*
64526471 standard-plugin usr_05.txt /*standard-plugin*
@@ -6744,7 +6763,6 @@
67446763 tcl-window-height if_tcl.txt /*tcl-window-height*
67456764 tcl-window-option if_tcl.txt /*tcl-window-option*
67466765 tcsh-style cmdline.txt /*tcsh-style*
6747-tcsh-syntax syntax.txt /*tcsh-syntax*
67486766 tcsh.vim syntax.txt /*tcsh.vim*
67496767 tear-off-menus gui.txt /*tear-off-menus*
67506768 telnet-CTRL-] tagsrch.txt /*telnet-CTRL-]*
@@ -6759,7 +6777,6 @@
67596777 termcap-colors term.txt /*termcap-colors*
67606778 termcap-cursor-color term.txt /*termcap-cursor-color*
67616779 termcap-cursor-shape term.txt /*termcap-cursor-shape*
6762-termcap-syntax syntax.txt /*termcap-syntax*
67636780 termcap-title term.txt /*termcap-title*
67646781 terminal-colors os_unix.txt /*terminal-colors*
67656782 terminal-info term.txt /*terminal-info*
@@ -6772,11 +6789,9 @@
67726789 tex-runon syntax.txt /*tex-runon*
67736790 tex-slow syntax.txt /*tex-slow*
67746791 tex-style syntax.txt /*tex-style*
6775-tex-syntax syntax.txt /*tex-syntax*
67766792 tex.vim syntax.txt /*tex.vim*
67776793 text-objects motion.txt /*text-objects*
67786794 text-objects-changed version5.txt /*text-objects-changed*
6779-tf-syntax syntax.txt /*tf-syntax*
67806795 tf.vim syntax.txt /*tf.vim*
67816796 this_session-variable eval.txt /*this_session-variable*
67826797 throw-catch eval.txt /*throw-catch*
@@ -7029,10 +7044,8 @@
70297044 various-cmds various.txt /*various-cmds*
70307045 various-motions motion.txt /*various-motions*
70317046 various.txt various.txt /*various.txt*
7032-vb-syntax syntax.txt /*vb-syntax*
70337047 vb.vim syntax.txt /*vb.vim*
70347048 verbose starting.txt /*verbose*
7035-verilog-indent indent.txt /*verilog-indent*
70367049 version-5.1 version5.txt /*version-5.1*
70377050 version-5.2 version5.txt /*version-5.2*
70387051 version-5.3 version5.txt /*version-5.3*
@@ -7062,14 +7075,12 @@
70627075 vim-arguments starting.txt /*vim-arguments*
70637076 vim-default-editor gui_w32.txt /*vim-default-editor*
70647077 vim-dev intro.txt /*vim-dev*
7065-vim-indent indent.txt /*vim-indent*
70667078 vim-kpart gui_x11.txt /*vim-kpart*
70677079 vim-mac intro.txt /*vim-mac*
70687080 vim-modes intro.txt /*vim-modes*
70697081 vim-modes-intro intro.txt /*vim-modes-intro*
70707082 vim-multibyte intro.txt /*vim-multibyte*
70717083 vim-script-intro usr_41.txt /*vim-script-intro*
7072-vim-syntax syntax.txt /*vim-syntax*
70737084 vim-variable eval.txt /*vim-variable*
70747085 vim.vim syntax.txt /*vim.vim*
70757086 vim: options.txt /*vim:*
@@ -7212,7 +7223,6 @@
72127223 x11-clientserver remote.txt /*x11-clientserver*
72137224 x11-cut-buffer gui_x11.txt /*x11-cut-buffer*
72147225 x11-selection gui_x11.txt /*x11-selection*
7215-xf86conf-syntax syntax.txt /*xf86conf-syntax*
72167226 xf86conf.vim syntax.txt /*xf86conf.vim*
72177227 xfontset mbyte.txt /*xfontset*
72187228 xfree-xterm syntax.txt /*xfree-xterm*
@@ -7220,9 +7230,7 @@
72207230 xim-input-style mbyte.txt /*xim-input-style*
72217231 xiterm syntax.txt /*xiterm*
72227232 xml-folding syntax.txt /*xml-folding*
7223-xml-syntax syntax.txt /*xml-syntax*
72247233 xml.vim syntax.txt /*xml.vim*
7225-xpm-syntax syntax.txt /*xpm-syntax*
72267234 xpm.vim syntax.txt /*xpm.vim*
72277235 xterm-8-bit term.txt /*xterm-8-bit*
72287236 xterm-8bit term.txt /*xterm-8bit*
diff -r 4772a5e3f9fa -r ce2181d14aa0 runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Mon Aug 29 22:25:38 2005 +0000
+++ b/runtime/doc/todo.txt Tue Aug 30 21:55:26 2005 +0000
@@ -1,4 +1,4 @@
1-*todo.txt* For Vim version 7.0aa. Last change: 2005 Aug 29
1+*todo.txt* For Vim version 7.0aa. Last change: 2005 Aug 30
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,58 +30,16 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
33-Spelling:
34-- Check support of flags of two characters, numbers (comma separated) and HUH.
35- When using many compound flags, does regexp still work?
36-
37-- "zg" doesn't work for Thai?
38-
39-- Compound word is accepted if nr of words is <= COMPOUNDMAX OR nr of
40- syllables <= COMPOUNDSYLMAX. Specify AND in the affix file?
41-
42-- COMPOUNDMAX -> COMPOUNDWORDMAX?
43-
44-- Support flags on a suffix. Used for second level affixes.
45- The flags may also be used for compounding. Default is an OR mechanism with
46- the flags of the word. Adding "compset" on the affixes means the compound
47- flags of the word are not used.
48- Instead of "SFX a 0 add/FLAGS ." we could use "SFX a 0 add . /FLAGS".
49-
50-- NEEDCOMPOUND also used for affix? Or use "needcomp" after affix?
51-
52-- Do we need a flag for the rule that when compounding is done the following
53- word doesn't have a capital after a word character, even for Onecap words?
33+Mac:
34+- strings.h is bogus, add configure check.
35+- GUI: pasting lines results in ^M instead of line breaks. (Benjamin Esham)
36+- "cp -R ../runtime appdir" may copy way too much.
5437
55-- Also see tklspell: http://tkltrans.sourceforge.net/
56-- New hunspell home page: http://hunspell.sourceforge.net/
57- - Lots of code depends on LANG, that isn't right. Enable each mechanism
58- in the affix file separately.
59- - Example with compounding dash is bad, gets in the way of setting
60- COMPOUNDMIN and COMPOUNDMAX to a reasonable value.
61- - PSEUDOROOT == NEEDAFFIX
62- - COMPOUNDROOT -> COMPOUNDED? For a word that already is a compound word
63- Or use COMPOUNDED2, COMPOUNDED3, etc.
64-- CIRCUMFIX: when a word uses a prefix marked with the CIRCUMFIX flag,
65- then the word must also have a suffix marked with the CIRCUMFIX flag.
66- It's a bit primitive, since only one flag is used, which doesn't allow
67- matching specific prefixes with suffixes.
68- Alternative:
69- PSFX {flag} {pchop} {padd} {pcond} {schop} {sadd}[/flags] {scond}
70- We might not need this at all, you can use the NEEDAFFIX flag.
71-- When a suffix has more than one syllable, it may count as a word for
72- COMPOUNDMAX.
73-- Add flags to count extra syllables in a word. SYLLABLEADDONE
74- SYLLABLEADDTWO, etc.? Or make it possible to specify the syllable count
75- of a word directly, after another slash: /abc/3
76-- MORPHO items ignores morphological items: after word and affix
38+cmdline_at_end() and cmdline_overstrike() may not be used.
7739
78-- Implement multiple flags for compound words and CMP item?
79- Await comments from other spell checking authors.
40+Ruby: documentation for window width (Wind)
8041
81-Help tags: something to make it easy to find help about a certain filetype?
82- use ft-c-syntax ft-c-ftplugin etc.?
83-
84-Mac GUI: pasting lines results in ^M instead of line breaks. (Benjamin Esham)
42+Add a few more languages for spell checking.
8543
8644 Mac unicode patch (Da Woon Jung):
8745 - selecting proportional font breaks display
@@ -1348,6 +1306,43 @@
13481306 Spell checking:
13491307 9 Work together with OpenOffice.org to update the wordlists. (Adri Verhoef,
13501308 Aad Nales) Setup vim-spell maillist?
1309+- Compound word is accepted if nr of words is <= COMPOUNDMAX OR nr of
1310+ syllables <= COMPOUNDSYLMAX. Specify using AND in the affix file?
1311+- COMPOUNDMAX -> COMPOUNDWORDMAX?
1312+- Support flags on a suffix. Used for second level affixes. The flags may
1313+ also be used for compounding. Default is an OR mechanism with the flags
1314+ of the word. Adding "compset" on the affixes means the compound flags of
1315+ the word are not used. Instead of "SFX a 0 add/FLAGS ." we could use "SFX
1316+ a 0 add . /FLAGS" (or support both).
1317+- NEEDCOMPOUND also used for affix? Or use "needcomp" after affix?
1318+- Do we need a flag for the rule that when compounding is done the following
1319+ word doesn't have a capital after a word character, even for Onecap words?
1320+- New hunspell home page: http://hunspell.sourceforge.net/
1321+ - Lots of code depends on LANG, that isn't right. Enable each mechanism
1322+ in the affix file separately.
1323+ - Example with compounding dash is bad, gets in the way of setting
1324+ COMPOUNDMIN and COMPOUNDMAX to a reasonable value.
1325+ - PSEUDOROOT == NEEDAFFIX
1326+ - COMPOUNDROOT -> COMPOUNDED? For a word that already is a compound word
1327+ Or use COMPOUNDED2, COMPOUNDED3, etc.
1328+- CIRCUMFIX: when a word uses a prefix marked with the CIRCUMFIX flag, then
1329+ the word must also have a suffix marked with the CIRCUMFIX flag. It's a
1330+ bit primitive, since only one flag is used, which doesn't allow matching
1331+ specific prefixes with suffixes.
1332+ Alternative:
1333+ PSFX {flag} {pchop} {padd} {pcond} {schop} {sadd}[/flags] {scond}
1334+ We might not need this at all, you can use the NEEDAFFIX flag and the
1335+ affix which is required.
1336+- When a suffix has more than one syllable, it may count as a word for
1337+ COMPOUNDMAX.
1338+- Add flags to count extra syllables in a word. SYLLABLEADD1 SYLLABLEADD2,
1339+ etc.? Or make it possible to specify the syllable count of a word
1340+ directly, e.g., after another slash: /abc/3
1341+- MORPHO item in affix file: ignore morphological fields after word and
1342+ affix.
1343+- Implement multiple flags for compound words and CMP item?
1344+ Await comments from other spell checking authors.
1345+- Also see tklspell: http://tkltrans.sourceforge.net/
13511346 8 Charles Campbell asks for method to add "contained" groups to existing
13521347 syntax items (to add @Spell).
13531348 Add ":syntax contains {pattern} add=@Spell" command? A bit like ":syn
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/fileio.c
--- a/src/fileio.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/fileio.c Tue Aug 30 21:55:26 2005 +0000
@@ -1515,8 +1515,6 @@
15151515 # ifdef MACOS_X
15161516 if (fio_flags & FIO_MACROMAN)
15171517 {
1518- extern int macroman2enc __ARGS((char_u *ptr, long *sizep, long
1519- real_size));
15201518 /*
15211519 * Conversion from Apple MacRoman char encoding to UTF-8 or
15221520 * latin1. This is in os_mac_conv.c.
@@ -4815,9 +4813,6 @@
48154813 */
48164814 char_u *from;
48174815 size_t fromlen;
4818- extern int enc2macroman __ARGS((char_u *from, size_t fromlen,
4819- char_u *to, int *tolenp, int maxtolen, char_u *rest,
4820- int *restlenp));
48214816
48224817 if (ip->bw_restlen > 0)
48234818 {
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/gui_mac.c
--- a/src/gui_mac.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/gui_mac.c Tue Aug 30 21:55:26 2005 +0000
@@ -94,10 +94,6 @@
9494 #if defined(USE_CARBONIZED) && defined(FEAT_MBYTE)
9595 # define USE_CARBONKEYHANDLER
9696 static EventHandlerUPP keyEventHandlerUPP = NULL;
97-/* Defined in os_mac_conv.c */
98-extern char_u *mac_utf16_to_enc __ARGS((UniChar *from, size_t fromLen, size_t *actualLen));
99-extern UniChar *mac_enc_to_utf16 __ARGS((char_u *from, size_t fromLen, size_t *actualLen));
100-extern CFStringRef mac_enc_to_cfstring __ARGS((char_u *from, size_t fromLen));
10197 #endif
10298
10399 #ifdef MACOS_X
@@ -1618,7 +1614,7 @@
16181614 */
16191615 #define FONT_STYLE_BUFFER_SIZE 32
16201616 static void
1621-GetFontPanelSelection(char_u* outName)
1617+GetFontPanelSelection(char_u *outName)
16221618 {
16231619 Str255 buf;
16241620 ByteCount fontNameLen = 0;
@@ -1639,12 +1635,12 @@
16391635 * get an unwanted utf-16 name) */
16401636 if (ATSUFindFontName(fid, kFontFullName, kFontMacintoshPlatform,
16411637 kFontNoScriptCode, kFontNoLanguageCode,
1642- 255, outName, &fontNameLen, NULL) != noErr)
1638+ 255, (char *)outName, &fontNameLen, NULL) != noErr)
16431639 return;
16441640
16451641 /* Only encode font size, because style (bold, italic, etc) is
16461642 * already part of the font full name */
1647- vim_snprintf(styleString, FONT_STYLE_BUFFER_SIZE, ":h%d",
1643+ vim_snprintf((char *)styleString, FONT_STYLE_BUFFER_SIZE, ":h%d",
16481644 gFontPanelInfo.size/*,
16491645 ((gFontPanelInfo.style & bold)!=0 ? ":b" : ""),
16501646 ((gFontPanelInfo.style & italic)!=0 ? ":i" : ""),
@@ -1655,7 +1651,7 @@
16551651 }
16561652 else
16571653 {
1658- *outName = NULL;
1654+ *outName = NUL;
16591655 }
16601656 }
16611657 #endif
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/if_ruby.c
--- a/src/if_ruby.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/if_ruby.c Tue Aug 30 21:55:26 2005 +0000
@@ -191,7 +191,7 @@
191191 static HINSTANCE hinstRuby = 0; /* Instance of ruby.dll */
192192
193193 /*
194- * Table of name to function pointer of python.
194+ * Table of name to function pointer of ruby.
195195 */
196196 #define RUBY_PROC FARPROC
197197 static struct
@@ -768,6 +768,24 @@
768768 return height;
769769 }
770770
771+static VALUE window_width(VALUE self)
772+{
773+ win_T *win = get_win(self);
774+
775+ return INT2NUM(win->w_width);
776+}
777+
778+static VALUE window_set_width(VALUE self, VALUE width)
779+{
780+ win_T *win = get_win(self);
781+ win_T *savewin = curwin;
782+
783+ curwin = win;
784+ win_setwidth(NUM2INT(width));
785+ curwin = savewin;
786+ return width;
787+}
788+
771789 static VALUE window_cursor(VALUE self)
772790 {
773791 win_T *win = get_win(self);
@@ -860,6 +878,8 @@
860878 rb_define_method(cVimWindow, "buffer", window_buffer, 0);
861879 rb_define_method(cVimWindow, "height", window_height, 0);
862880 rb_define_method(cVimWindow, "height=", window_set_height, 1);
881+ rb_define_method(cVimWindow, "width", window_width, 0);
882+ rb_define_method(cVimWindow, "width=", window_set_width, 1);
863883 rb_define_method(cVimWindow, "cursor", window_cursor, 0);
864884 rb_define_method(cVimWindow, "cursor=", window_set_cursor, 1);
865885
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/mbyte.c
--- a/src/mbyte.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/mbyte.c Tue Aug 30 21:55:26 2005 +0000
@@ -5788,11 +5788,6 @@
57885788 return dlen;
57895789 }
57905790
5791-#if defined(MACOS_X)
5792-/* This is in os_mac_conv.c. */
5793-extern char_u *mac_string_convert __ARGS((char_u *ptr, int len, int *lenp, int fail_on_error, int from, int to, int *unconvlenp));
5794-#endif
5795-
57965791 /*
57975792 * Convert text "ptr[*lenp]" according to "vcp".
57985793 * Returns the result in allocated memory and sets "*lenp".
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/normal.c
--- a/src/normal.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/normal.c Tue Aug 30 21:55:26 2005 +0000
@@ -4678,6 +4678,18 @@
46784678 == FAIL)
46794679 return;
46804680 # endif
4681+ if (ptr == NULL)
4682+ {
4683+ pos_T pos = curwin->w_cursor;
4684+ int attr;
4685+
4686+ /* Find bad word under the cursor. */
4687+ len = spell_move_to(curwin, FORWARD, TRUE, TRUE, &attr);
4688+ if (len != 0 && curwin->w_cursor.col <= pos.col)
4689+ ptr = ml_get_pos(&curwin->w_cursor);
4690+ curwin->w_cursor = pos;
4691+ }
4692+
46814693 if (ptr == NULL && (len = find_ident_under_cursor(&ptr,
46824694 FIND_IDENT)) == 0)
46834695 return;
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/option.c
--- a/src/option.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/option.c Tue Aug 30 21:55:26 2005 +0000
@@ -2994,7 +2994,7 @@
29942994 kLocaleRegionMask | kLocaleRegionVariantMask,
29952995 sizeof buf, buf) == noErr && *buf)
29962996 {
2997- vim_setenv("LANG", buf);
2997+ vim_setenv((char_u *)"LANG", (char_u *)buf);
29982998 # ifdef HAVE_LOCALE_H
29992999 setlocale(LC_ALL, "");
30003000 # endif
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/os_mac_conv.c
--- a/src/os_mac_conv.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/os_mac_conv.c Tue Aug 30 21:55:26 2005 +0000
@@ -17,17 +17,6 @@
1717 #include "vim.h"
1818
1919 #ifdef FEAT_MBYTE
20-extern char_u *mac_string_convert __ARGS((char_u *ptr, int len, int *lenp, int fail_on_error, int from, int to, int *unconvlenp));
21-extern int macroman2enc __ARGS((char_u *ptr, long *sizep, long real_size));
22-extern int enc2macroman __ARGS((char_u *from, size_t fromlen, char_u *to, int *tolenp, int maxtolen, char_u *rest, int *restlenp));
23-
24-extern void mac_conv_init __ARGS((void));
25-extern void mac_conv_cleanup __ARGS((void));
26-extern char_u *mac_utf16_to_enc __ARGS((UniChar *from, size_t fromLen, size_t *actualLen));
27-extern UniChar *mac_enc_to_utf16 __ARGS((char_u *from, size_t fromLen, size_t *actualLen));
28-extern CFStringRef mac_enc_to_cfstring __ARGS((char_u *from, size_t fromLen));
29-extern char_u *mac_precompose_path __ARGS((char_u *decompPath, size_t decompLen, size_t *precompLen));
30-
3120 static char_u *mac_utf16_to_utf8 __ARGS((UniChar *from, size_t fromLen, size_t *actualLen));
3221 static UniChar *mac_utf8_to_utf16 __ARGS((char_u *from, size_t fromLen, size_t *actualLen));
3322
@@ -114,7 +103,7 @@
114103
115104 if (!CFStringGetBytes(cfstr, convertRange, to, NULL, FALSE, retval, buflen, NULL))
116105 #endif
117- if (!CFStringGetCString(cfstr, retval, buflen, to))
106+ if (!CFStringGetCString(cfstr, (char *)retval, buflen, to))
118107 {
119108 CFRelease(cfstr);
120109 if (fail_on_error)
@@ -140,14 +129,14 @@
140129 }
141130 else
142131 {
143- if (!CFStringGetCString(cfstr, d, buflen - out, to))
132+ if (!CFStringGetCString(cfstr, (char *)d, buflen - out, to))
144133 {
145134 *d++ = '?';
146135 out++;
147136 }
148137 else
149138 {
150- i = strlen(d);
139+ i = STRLEN(d);
151140 d += i;
152141 out += i;
153142 }
@@ -162,7 +151,7 @@
162151 }
163152 CFRelease(cfstr);
164153 if (lenp != NULL)
165- *lenp = strlen(retval);
154+ *lenp = STRLEN(retval);
166155
167156 return retval;
168157 }
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/os_unix.c
--- a/src/os_unix.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/os_unix.c Tue Aug 30 21:55:26 2005 +0000
@@ -173,17 +173,6 @@
173173 static int have_dollars __ARGS((int, char_u **));
174174 #endif
175175
176-#ifndef NO_EXPANDPATH
177-# if defined(MACOS_X) && defined(FEAT_MBYTE)
178-extern char_u *mac_precompose_path __ARGS((char_u *decompPath, size_t decompLen, size_t *precompLen));
179-# endif
180-#endif
181-
182-#if defined(MACOS_X) && defined(FEAT_MBYTE)
183-extern void mac_conv_init __ARGS((void));
184-extern void mac_conv_cleanup __ARGS((void));
185-#endif
186-
187176 #ifndef __EMX__
188177 static int save_patterns __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file));
189178 #endif
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/proto.h
--- a/src/proto.h Mon Aug 29 22:25:38 2005 +0000
+++ b/src/proto.h Tue Aug 30 21:55:26 2005 +0000
@@ -261,6 +261,10 @@
261261 # include "if_perlsfio.pro"
262262 #endif
263263
264+#if defined(FEAT_MBYTE) && defined(MACOS_X)
265+# include "os_mac_conv.pro"
266+#endif
267+
264268 #ifdef __BORLANDC__
265269 # define _PROTO_H
266270 #endif
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/proto/gui_mac.pro
--- a/src/proto/gui_mac.pro Mon Aug 29 22:25:38 2005 +0000
+++ b/src/proto/gui_mac.pro Tue Aug 30 21:55:26 2005 +0000
@@ -47,6 +47,7 @@
4747 guicolor_T gui_mch_get_color __ARGS((char_u *name));
4848 void gui_mch_set_fg_color __ARGS((guicolor_T color));
4949 void gui_mch_set_bg_color __ARGS((guicolor_T color));
50+void gui_mch_set_sp_color __ARGS((guicolor_T color));
5051 void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags));
5152 int gui_mch_haskey __ARGS((char_u *name));
5253 void gui_mch_beep __ARGS((void));
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/proto/os_mac_conv.pro
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/proto/os_mac_conv.pro Tue Aug 30 21:55:26 2005 +0000
@@ -0,0 +1,10 @@
1+extern char_u *mac_string_convert __ARGS((char_u *ptr, int len, int *lenp, int fail_on_error, int from, int to, int *unconvlenp));
2+extern int macroman2enc __ARGS((char_u *ptr, long *sizep, long real_size));
3+extern int enc2macroman __ARGS((char_u *from, size_t fromlen, char_u *to, int *tolenp, int maxtolen, char_u *rest, int *restlenp));
4+
5+extern void mac_conv_init __ARGS((void));
6+extern void mac_conv_cleanup __ARGS((void));
7+extern char_u *mac_utf16_to_enc __ARGS((UniChar *from, size_t fromLen, size_t *actualLen));
8+extern UniChar *mac_enc_to_utf16 __ARGS((char_u *from, size_t fromLen, size_t *actualLen));
9+extern CFStringRef mac_enc_to_cfstring __ARGS((char_u *from, size_t fromLen));
10+extern char_u *mac_precompose_path __ARGS((char_u *decompPath, size_t decompLen, size_t *precompLen));
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/screen.c
--- a/src/screen.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/screen.c Tue Aug 30 21:55:26 2005 +0000
@@ -2939,6 +2939,10 @@
29392939 word_end = wp->w_cursor.col + len + 1;
29402940
29412941 wp->w_cursor = pos;
2942+
2943+ /* Need to restart syntax highlighting for this line. */
2944+ if (has_syntax)
2945+ syntax_start(wp, lnum);
29422946 }
29432947 #endif
29442948 }
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/spell.c
--- a/src/spell.c Mon Aug 29 22:25:38 2005 +0000
+++ b/src/spell.c Tue Aug 30 21:55:26 2005 +0000
@@ -375,7 +375,7 @@
375375 char_u *sl_midword; /* MIDWORD string or NULL */
376376
377377 int sl_compmax; /* COMPOUNDMAX (default: MAXWLEN) */
378- int sl_compminlen; /* COMPOUNDMIN (default: MAXWLEN) */
378+ int sl_compminlen; /* COMPOUNDMIN (default: 0) */
379379 int sl_compsylmax; /* COMPOUNDSYLMAX (default: MAXWLEN) */
380380 regprog_T *sl_compprog; /* COMPOUNDFLAGS turned into a regexp progrm
381381 * (NULL when no compounding) */
@@ -1299,7 +1299,7 @@
12991299 /* For multi-byte chars check character length against
13001300 * COMPOUNDMIN. */
13011301 if (has_mbyte
1302- && slang->sl_compminlen < MAXWLEN
1302+ && slang->sl_compminlen > 0
13031303 && mb_charlen_len(mip->mi_word + mip->mi_compoff,
13041304 wlen - mip->mi_compoff) < slang->sl_compminlen)
13051305 continue;
@@ -1388,6 +1388,8 @@
13881388 {
13891389 int save_result = mip->mi_result;
13901390 char_u *save_end = mip->mi_end;
1391+ langp_T *save_lp = mip->mi_lp;
1392+ int lpi;
13911393
13921394 /* Check that a valid word follows. If there is one and we
13931395 * are compounding, it will set "mi_result", thus we are
@@ -1417,25 +1419,43 @@
14171419 #endif
14181420 c = mip->mi_compoff;
14191421 ++mip->mi_complen;
1420- find_word(mip, FIND_COMPOUND);
1421-
1422- /* When NOBREAK any word that matches is OK. Otherwise we
1423- * need to find the longest match, thus try with keep-case and
1424- * prefix too. */
1425- if (!slang->sl_nobreak || mip->mi_result == SP_BAD)
1426- {
1427- /* Find following word in keep-case tree. */
1428- mip->mi_compoff = wlen;
1429- find_word(mip, FIND_KEEPCOMPOUND);
1430-
1422+
1423+ /* For NOBREAK we need to try all NOBREAK languages, at least
1424+ * to find the ".add" file(s). */
1425+ for (lpi = 0; lpi < mip->mi_buf->b_langp.ga_len; ++lpi)
1426+ {
1427+ if (slang->sl_nobreak)
1428+ {
1429+ mip->mi_lp = LANGP_ENTRY(mip->mi_buf->b_langp, lpi);
1430+ if (mip->mi_lp->lp_slang->sl_fidxs == NULL
1431+ || !mip->mi_lp->lp_slang->sl_nobreak)
1432+ continue;
1433+ }
1434+
1435+ find_word(mip, FIND_COMPOUND);
1436+
1437+ /* When NOBREAK any word that matches is OK. Otherwise we
1438+ * need to find the longest match, thus try with keep-case
1439+ * and prefix too. */
14311440 if (!slang->sl_nobreak || mip->mi_result == SP_BAD)
14321441 {
1433- /* Check for following word with prefix. */
1434- mip->mi_compoff = c;
1435- find_prefix(mip, FIND_COMPOUND);
1442+ /* Find following word in keep-case tree. */
1443+ mip->mi_compoff = wlen;
1444+ find_word(mip, FIND_KEEPCOMPOUND);
1445+
1446+ if (!slang->sl_nobreak || mip->mi_result == SP_BAD)
1447+ {
1448+ /* Check for following word with prefix. */
1449+ mip->mi_compoff = c;
1450+ find_prefix(mip, FIND_COMPOUND);
1451+ }
14361452 }
1453+
1454+ if (!slang->sl_nobreak)
1455+ break;
14371456 }
14381457 --mip->mi_complen;
1458+ mip->mi_lp = save_lp;
14391459
14401460 if (slang->sl_nobreak)
14411461 {
@@ -2037,6 +2057,13 @@
20372057 }
20382058 }
20392059
2060+typedef struct spelload_S
2061+{
2062+ char_u sl_lang[MAXWLEN + 1]; /* language name */
2063+ slang_T *sl_slang; /* resulting slang_T struct */
2064+ int sl_nobreak; /* NOBREAK language found */
2065+} spelload_T;
2066+
20402067 /*
20412068 * Load word list(s) for "lang" from Vim spell file(s).
20422069 * "lang" must be the language without the region: e.g., "en".
@@ -2047,35 +2074,37 @@
20472074 {
20482075 char_u fname_enc[85];
20492076 int r;
2050- char_u langcp[MAXWLEN + 1];
2077+ spelload_T sl;
20512078
20522079 /* Copy the language name to pass it to spell_load_cb() as a cookie.
20532080 * It's truncated when an error is detected. */
2054- STRCPY(langcp, lang);
2081+ STRCPY(sl.sl_lang, lang);
2082+ sl.sl_slang = NULL;
2083+ sl.sl_nobreak = FALSE;
20552084
20562085 /*
20572086 * Find the first spell file for "lang" in 'runtimepath' and load it.
20582087 */
20592088 vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
20602089 "spell/%s.%s.spl", lang, spell_enc());
2061- r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &langcp);
2062-
2063- if (r == FAIL && *langcp != NUL)
2090+ r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
2091+
2092+ if (r == FAIL && *sl.sl_lang != NUL)
20642093 {
20652094 /* Try loading the ASCII version. */
20662095 vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
20672096 "spell/%s.ascii.spl", lang);
2068- r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &langcp);
2097+ r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
20692098 }
20702099
20712100 if (r == FAIL)
20722101 smsg((char_u *)_("Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""),
20732102 lang, spell_enc(), lang);
2074- else if (*langcp != NUL)
2075- {
2076- /* Load all the additions. */
2103+ else if (sl.sl_slang != NULL)
2104+ {
2105+ /* At least one file was loaded, now load all the additions. */
20772106 STRCPY(fname_enc + STRLEN(fname_enc) - 3, "add.spl");
2078- do_in_runtimepath(fname_enc, TRUE, spell_load_cb, &langcp);
2107+ do_in_runtimepath(fname_enc, TRUE, spell_load_cb, &sl);
20792108 }
20802109 }
20812110
@@ -2122,7 +2151,6 @@
21222151 lp->sl_name = vim_strsave(lang);
21232152 ga_init2(&lp->sl_rep, sizeof(fromto_T), 10);
21242153 lp->sl_compmax = MAXWLEN;
2125- lp->sl_compminlen = MAXWLEN;
21262154 lp->sl_compsylmax = MAXWLEN;
21272155 }
21282156 return lp;
@@ -2237,7 +2265,7 @@
22372265 #endif
22382266
22392267 lp->sl_compmax = MAXWLEN;
2240- lp->sl_compminlen = MAXWLEN;
2268+ lp->sl_compminlen = 0;
22412269 lp->sl_compsylmax = MAXWLEN;
22422270 lp->sl_regions[0] = NUL;
22432271 }
@@ -2249,9 +2277,23 @@
22492277 static void
22502278 spell_load_cb(fname, cookie)
22512279 char_u *fname;
2252- void *cookie; /* points to the language name */
2253-{
2254- (void)spell_load_file(fname, (char_u *)cookie, NULL, FALSE);
2280+ void *cookie;
2281+{
2282+ spelload_T *slp = (spelload_T *)cookie;
2283+ slang_T *slang;
2284+
2285+ slang = spell_load_file(fname, slp->sl_lang, NULL, FALSE);
2286+ if (slang != NULL)
2287+ {
2288+ /* When a previously loaded file has NOBREAK also use it for the
2289+ * ".add" files. */
2290+ if (slp->sl_nobreak && slang->sl_add)
2291+ slang->sl_nobreak = TRUE;
2292+ else if (slang->sl_nobreak)
2293+ slp->sl_nobreak = TRUE;
2294+
2295+ slp->sl_slang = slang;
2296+ }
22552297 }
22562298
22572299 /*
@@ -2941,7 +2983,7 @@
29412983 --todo;
29422984 c = getc(fd); /* <compminlen> */
29432985 if (c < 1)
2944- c = MAXWLEN;
2986+ c = 0;
29452987 slang->sl_compminlen = c;
29462988
29472989 --todo;
@@ -3508,6 +3550,7 @@
35083550 char_u *spf;
35093551 char_u *use_region = NULL;
35103552 int dont_use_region = FALSE;
3553+ int nobreak = FALSE;
35113554
35123555 ga_init2(&ga, sizeof(langp_T), 2);
35133556 clear_midword(buf);
@@ -3624,6 +3667,8 @@
36243667 LANGP_ENTRY(ga, ga.ga_len)->lp_region = region_mask;
36253668 ++ga.ga_len;
36263669 use_midword(lp, buf);
3670+ if (lp->sl_nobreak)
3671+ nobreak = TRUE;
36273672 }
36283673 }
36293674 }
@@ -3678,6 +3723,11 @@
36783723 *p = NUL; /* truncate at ".encoding.add" */
36793724 }
36803725 lp = spell_load_file(spf_name, lang, NULL, TRUE);
3726+
3727+ /* If one of the languages has NOBREAK we assume the addition
3728+ * files also have this. */
3729+ if (lp != NULL && nobreak)
3730+ lp->sl_nobreak = TRUE;
36813731 }
36823732 if (lp != NULL && ga_grow(&ga, 1) == OK)
36833733 {
@@ -5229,8 +5279,6 @@
52295279 STRCPY(p, spin->si_compflags);
52305280 STRCAT(p, "/");
52315281 }
5232- else
5233- *p = NUL;
52345282 spin->si_compflags = p;
52355283 tp = p + STRLEN(p);
52365284
@@ -7703,37 +7751,55 @@
77037751 char_u *fname;
77047752 char_u *rtp;
77057753 char_u *lend;
7754+ int aspath = FALSE;
7755+ char_u *lstart = curbuf->b_p_spl;
77067756
77077757 if (*curbuf->b_p_spl != NUL && curbuf->b_langp.ga_len > 0)
77087758 {
7709- /* Find the end of the language name. Exclude the region. */
7759+ /* Find the end of the language name. Exclude the region. If there
7760+ * is a path separator remember the start of the tail. */
77107761 for (lend = curbuf->b_p_spl; *lend != NUL
77117762 && vim_strchr((char_u *)",._", *lend) == NULL; ++lend)
7712- ;
7763+ if (vim_ispathsep(*lend))
7764+ {
7765+ aspath = TRUE;
7766+ lstart = lend + 1;
7767+ }
77137768
77147769 /* Loop over all entries in 'runtimepath'. Use the first one where we
77157770 * are allowed to write. */
77167771 rtp = p_rtp;
77177772 while (*rtp != NUL)
77187773 {
7719- /* Copy the path from 'runtimepath' to buf[]. */
7720- copy_option_part(&rtp, buf, MAXPATHL, ",");
7774+ if (aspath)
7775+ /* Use directory of an entry with path, e.g., for
7776+ * "/dir/lg.utf-8.spl" use "/dir". */
7777+ vim_strncpy(buf, curbuf->b_p_spl, lstart - curbuf->b_p_spl - 1);
7778+ else
7779+ /* Copy the path from 'runtimepath' to buf[]. */
7780+ copy_option_part(&rtp, buf, MAXPATHL, ",");
77217781 if (filewritable(buf) == 2)
77227782 {
77237783 /* Use the first language name from 'spelllang' and the
77247784 * encoding used in the first loaded .spl file. */
7725- fname = LANGP_ENTRY(curbuf->b_langp, 0)->lp_slang->sl_fname;
7726- if (fname == NULL)
7727- break;
7785+ if (aspath)
7786+ vim_strncpy(buf, curbuf->b_p_spl, lend - curbuf->b_p_spl);
7787+ else
7788+ {
7789+ l = STRLEN(buf);
7790+ vim_snprintf((char *)buf + l, MAXPATHL - l,
7791+ "/spell/%.*s", (int)(lend - lstart), lstart);
7792+ }
77287793 l = STRLEN(buf);
7729- vim_snprintf((char *)buf + l, MAXPATHL - l,
7730- "/spell/%.*s.%s.add",
7731- (int)(lend - curbuf->b_p_spl), curbuf->b_p_spl,
7732- strstr((char *)gettail(fname), ".ascii.") != NULL
7733- ? (char_u *)"ascii" : spell_enc());
7794+ fname = LANGP_ENTRY(curbuf->b_langp, 0)->lp_slang->sl_fname;
7795+ vim_snprintf((char *)buf + l, MAXPATHL - l, ".%s.add",
7796+ fname != NULL
7797+ && strstr((char *)gettail(fname), ".ascii.") != NULL
7798+ ? (char_u *)"ascii" : spell_enc());
77347799 set_option_value((char_u *)"spellfile", 0L, buf, OPT_LOCAL);
77357800 break;
77367801 }
7802+ aspath = FALSE;
77377803 }
77387804 }
77397805 }
@@ -9293,7 +9359,7 @@
92939359 /* For multi-byte chars check character length against
92949360 * COMPOUNDMIN. */
92959361 if (has_mbyte
9296- && slang->sl_compminlen < MAXWLEN
9362+ && slang->sl_compminlen > 0
92979363 && mb_charlen(tword + sp->ts_splitoff)
92989364 < slang->sl_compminlen)
92999365 break;
@@ -9430,7 +9496,7 @@
94309496 >= slang->sl_compminlen
94319497 #ifdef FEAT_MBYTE
94329498 && (!has_mbyte
9433- || slang->sl_compminlen == MAXWLEN
9499+ || slang->sl_compminlen == 0
94349500 || mb_charlen(tword + sp->ts_splitoff)
94359501 >= slang->sl_compminlen)
94369502 #endif
@@ -9470,7 +9536,12 @@
94709536 if (!try_compound && !fword_ends)
94719537 {
94729538 /* If we're going to split need to check that the
9473- * words so far are valid for compounding. */
9539+ * words so far are valid for compounding. If there
9540+ * is only one word it must not have the NEEDCOMPOUND
9541+ * flag. */
9542+ if (sp->ts_complen == sp->ts_compsplit
9543+ && (flags & WF_NEEDCOMP))
9544+ break;
94749545 p = preword;
94759546 while (*skiptowhite(p) != NUL)
94769547 p = skipwhite(skiptowhite(p));
@@ -9576,7 +9647,11 @@
95769647 case STATE_ENDNUL:
95779648 /* Past the NUL bytes in the node. */
95789649 su->su_badflags = sp->ts_save_badflags;
9579- if (fword[sp->ts_fidx] == NUL)
9650+ if (fword[sp->ts_fidx] == NUL
9651+#ifdef FEAT_MBYTE
9652+ && sp->ts_tcharlen == 0
9653+#endif
9654+ )
95809655 {
95819656 /* The badword ends, can't use the bytes in this node. */
95829657 sp->ts_state = STATE_DEL;
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/testdir/test58.in
--- a/src/testdir/test58.in Mon Aug 29 22:25:38 2005 +0000
+++ b/src/testdir/test58.in Tue Aug 30 21:55:26 2005 +0000
@@ -93,6 +93,9 @@
9393 :" Compound words
9494 :call TestOne('3', '3')
9595 :call TestOne('4', '4')
96+:call TestOne('5', '5')
97+:call TestOne('6', '6')
98+:call TestOne('7', '7')
9699 :"
97100 gg:/^test output:/,$wq! test.out
98101 ENDTEST
@@ -474,4 +477,123 @@
474477 startwordwordwordwordend borkpreborkpreborkbork
475478 badend
476479
480+Test affix flags with two characters
481+
482+5affstart
483+SET ISO8859-1
484+
485+FLAG long
486+
487+NEEDAFFIX !!
488+
489+COMPOUNDFLAGS ssmm*ee
490+
491+NEEDCOMPOUND xx
492+
493+SFX 13 Y 1
494+SFX 13 0 bork .
495+
496+SFX a1 Y 1
497+SFX a1 0 a1 .
498+
499+SFX aé Y 1
500+SFX aé 0 aé .
501+
502+PFX zz Y 1
503+PFX zz 0 pre .
504+5affend
505+
506+5dicstart
507+1234
508+foo/a1aé!!
509+bar/zz13ee
510+start/ss
511+end/ee
512+middle/mmxx
513+5dicend
514+
515+5good: fooa1 fooaé bar prebar barbork prebarbork startprebar
516+ start end startend startmiddleend
517+bad: foo fooa2 prabar probarbirk middle startmiddle middleend endstart
518+ startprobar
519+badend
520+
521+6affstart
522+SET ISO8859-1
523+
524+FLAG caplong
525+
526+NEEDAFFIX A!
527+
528+COMPOUNDFLAGS sMm*Ee
529+
530+NEEDCOMPOUND Xx
531+
532+SFX N3 Y 1
533+SFX N3 0 bork .
534+
535+SFX A1 Y 1
536+SFX A1 0 a1 .
537+
538+SFX Aé Y 1
539+SFX Aé 0 aé .
540+
541+PFX Zz Y 1
542+PFX Zz 0 pre .
543+6affend
544+
545+6dicstart
546+1234
547+mee/A1AéA!
548+bar/ZzN3Ee
549+lead/s
550+end/Ee
551+middle/MmXx
552+6dicend
553+
554+6good: meea1 meeaé bar prebar barbork prebarbork leadprebar
555+ lead end leadend leadmiddleend
556+bad: mee meea2 prabar probarbirk middle leadmiddle middleend endlead
557+ leadprobar
558+badend
559+
560+7affstart
561+SET ISO8859-1
562+
563+FLAG num
564+
565+NEEDAFFIX 9999
566+
567+COMPOUNDFLAGS 2,77*123
568+
569+NEEDCOMPOUND 1
570+
571+SFX 61003 Y 1
572+SFX 61003 0 meat .
573+
574+SFX 391 Y 1
575+SFX 391 0 a1 .
576+
577+SFX 111 Y 1
578+SFX 111 0 aé .
579+
580+PFX 17 Y 1
581+PFX 17 0 pre .
582+7affend
583+
584+7dicstart
585+1234
586+mee/391,111,9999
587+bar/17,61003,123
588+lead/2
589+tail/123
590+middle/77,1
591+7dicend
592+
593+7good: meea1 meeaé bar prebar barmeat prebarmeat leadprebar
594+ lead tail leadtail leadmiddletail
595+bad: mee meea2 prabar probarmaat middle leadmiddle middletail taillead
596+ leadprobar
597+badend
598+
477599 test output:
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/testdir/test58.ok
--- a/src/testdir/test58.ok Mon Aug 29 22:25:38 2005 +0000
+++ b/src/testdir/test58.ok Tue Aug 30 21:55:26 2005 +0000
@@ -105,19 +105,19 @@
105105 foomï
106106 ['foo mï', 'foo', 'foofoo']
107107 barmï
108-['bar mï', 'barfoo', 'barbar']
108+['barfoo', 'barbar', 'mï']
109109 mïfoo
110110 ['mï foo', 'foo', 'foofoo']
111111 mïbar
112112 ['foobar', 'barbar', 'mï']
113113 mïmï
114-['mï mï', 'mï', 'la mï']
114+['mï mï', 'mï']
115115 lala
116-['la mï']
116+[]
117117 mïla
118118 ['mï', 'mï mï']
119119 lamï
120-['la mï', 'mï', 'mï mï']
120+['mï', 'mï mï']
121121 foola
122122 ['foo', 'foobar', 'foofoo']
123123 labar
@@ -160,3 +160,99 @@
160160 ['startwordwordwordword end', 'startwordwordwordword', 'start wordwordwordword end']
161161 borkpreborkpreborkbork
162162 ['borkpreborkprebork bork', 'borkprebork preborkbork', 'bork preborkpreborkbork']
163+
164+test 5-5
165+# file: Xtest.latin1.spl
166+bar
167+barbork
168+end
169+fooa1
170+fooaé
171+prebar
172+prebarbork
173+start
174+-------
175+bad
176+['bar', 'end', 'fooa1']
177+foo
178+['fooa1', 'fooaé', 'bar']
179+fooa2
180+['fooa1', 'fooaé', 'bar']
181+prabar
182+['prebar', 'bar', 'bar bar']
183+probarbirk
184+['prebarbork']
185+middle
186+[]
187+startmiddle
188+['startmiddleend']
189+middleend
190+[]
191+endstart
192+['end start', 'start']
193+startprobar
194+['startprebar', 'start prebar', 'startbar']
195+
196+test 6-6
197+# file: Xtest.latin1.spl
198+bar
199+barbork
200+end
201+lead
202+meea1
203+meeaé
204+prebar
205+prebarbork
206+-------
207+bad
208+['bar', 'end', 'lead']
209+mee
210+['meea1', 'meeaé', 'bar']
211+meea2
212+['meea1', 'meeaé', 'lead']
213+prabar
214+['prebar', 'leadbar', 'bar']
215+probarbirk
216+['prebarbork']
217+middle
218+[]
219+leadmiddle
220+['leadmiddleend']
221+middleend
222+[]
223+endlead
224+['end lead', 'lead', 'end end']
225+leadprobar
226+['leadprebar', 'lead prebar', 'leadbar']
227+
228+test 7-7
229+# file: Xtest.latin1.spl
230+bar
231+barmeat
232+lead
233+meea1
234+meeaé
235+prebar
236+prebarmeat
237+tail
238+-------
239+bad
240+['bar', 'lead', 'tail']
241+mee
242+['meea1', 'meeaé', 'bar']
243+meea2
244+['meea1', 'meeaé', 'lead']
245+prabar
246+['prebar', 'leadbar', 'bar']
247+probarmaat
248+['prebarmeat']
249+middle
250+[]
251+leadmiddle
252+[]
253+middletail
254+[]
255+taillead
256+['tail lead', 'tail']
257+leadprobar
258+['leadprebar', 'lead prebar', 'leadbar']
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/testdir/test59.in
--- a/src/testdir/test59.in Mon Aug 29 22:25:38 2005 +0000
+++ b/src/testdir/test59.in Tue Aug 30 21:55:26 2005 +0000
@@ -97,6 +97,9 @@
9797 :" Compound words
9898 :call TestOne('3', '3')
9999 :call TestOne('4', '4')
100+:call TestOne('5', '5')
101+:call TestOne('6', '6')
102+:call TestOne('7', '7')
100103 :"
101104 gg:/^test output:/,$wq! test.out
102105 ENDTEST
@@ -478,4 +481,127 @@
478481 test2:
479482 elequint test elekwint test elekwent asdf
480483
484+Test affix flags with two characters
485+
486+5affstart
487+SET ISO8859-1
488+
489+FLAG long
490+
491+NEEDAFFIX !!
492+
493+COMPOUNDFLAGS ssmm*ee
494+
495+NEEDCOMPOUND xx
496+
497+SFX 13 Y 1
498+SFX 13 0 bork .
499+
500+SFX a1 Y 1
501+SFX a1 0 a1 .
502+
503+SFX aé Y 1
504+SFX aé 0 aé .
505+
506+PFX zz Y 1
507+PFX zz 0 pre .
508+5affend
509+
510+5dicstart
511+1234
512+foo/a1aé!!
513+bar/zz13ee
514+start/ss
515+end/ee
516+middle/mmxx
517+5dicend
518+
519+5good: fooa1 fooaé bar prebar barbork prebarbork startprebar
520+ start end startend startmiddleend
521+bad: foo fooa2 prabar probarbirk middle startmiddle middleend endstart
522+ startprobar
523+badend
524+
525+6affstart
526+SET ISO8859-1
527+
528+FLAG caplong
529+
530+NEEDAFFIX A!
531+
532+COMPOUNDFLAGS sMm*Ee
533+
534+NEEDCOMPOUND Xx
535+
536+SFX N3 Y 1
537+SFX N3 0 bork .
538+
539+SFX A1 Y 1
540+SFX A1 0 a1 .
541+
542+SFX Aé Y 1
543+SFX Aé 0 aé .
544+
545+PFX Zz Y 1
546+PFX Zz 0 pre .
547+6affend
548+
549+6dicstart
550+1234
551+mee/A1AéA!
552+bar/ZzN3Ee
553+lead/s
554+end/Ee
555+middle/MmXx
556+6dicend
557+
558+6good: meea1 meeaé bar prebar barbork prebarbork leadprebar
559+ lead end leadend leadmiddleend
560+bad: mee meea2 prabar probarbirk middle leadmiddle middleend endlead
561+ leadprobar
562+badend
563+
564+7affstart
565+SET ISO8859-1
566+
567+FOL àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
568+LOW àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
569+UPP ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßÿ
570+
571+FLAG num
572+
573+NEEDAFFIX 9999
574+
575+COMPOUNDFLAGS 2,77*123
576+
577+NEEDCOMPOUND 1
578+
579+SFX 61003 Y 1
580+SFX 61003 0 meat .
581+
582+SFX 391 Y 1
583+SFX 391 0 a1 .
584+
585+SFX 111 Y 1
586+SFX 111 0 aé .
587+
588+PFX 17 Y 1
589+PFX 17 0 pre .
590+7affend
591+
592+7dicstart
593+1234
594+mee/391,111,9999
595+bar/17,61003,123
596+lead/2
597+tail/123
598+middle/77,1
599+7dicend
600+
601+7good: meea1 meeaé bar prebar barmeat prebarmeat leadprebar
602+ lead tail leadtail leadmiddletail
603+bad: mee meea2 prabar probarmaat middle leadmiddle middletail taillead
604+ leadprobar
605+badend
606+
481607 test output:
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/testdir/test59.ok
--- a/src/testdir/test59.ok Mon Aug 29 22:25:38 2005 +0000
+++ b/src/testdir/test59.ok Tue Aug 30 21:55:26 2005 +0000
@@ -101,23 +101,23 @@
101101 bar
102102 ['foobar', 'foo', 'mï']
103103 la
104-['foo', 'mï']
104+['mï', 'foo']
105105 foomï
106106 ['foo mï', 'foo', 'foofoo']
107107 barmï
108-['bar mï', 'barfoo', 'barbar']
108+['barfoo', 'barbar', 'mï']
109109 mïfoo
110110 ['mï foo', 'foo', 'foofoo']
111111 mïbar
112112 ['foobar', 'barbar', 'mï']
113113 mïmï
114-['mï mï', 'mï', 'la mï']
114+['mï mï', 'mï']
115115 lala
116116 []
117117 mïla
118-['mï']
118+['mï', 'mï mï']
119119 lamï
120-['la mï', 'mï', 'mï mï']
120+['mï', 'mï mï']
121121 foola
122122 ['foo', 'foobar', 'foofoo']
123123 labar
@@ -160,3 +160,99 @@
160160 ['startwordwordwordword end', 'startwordwordwordword', 'start wordwordwordword end']
161161 borkpreborkpreborkbork
162162 ['borkpreborkprebork bork', 'borkprebork preborkbork', 'bork preborkpreborkbork']
163+
164+test 5-5
165+# file: Xtest.utf-8.spl
166+bar
167+barbork
168+end
169+fooa1
170+fooaé
171+prebar
172+prebarbork
173+start
174+-------
175+bad
176+['bar', 'end', 'fooa1']
177+foo
178+['fooa1', 'fooaé', 'bar']
179+fooa2
180+['fooa1', 'fooaé', 'bar']
181+prabar
182+['prebar', 'bar', 'bar bar']
183+probarbirk
184+['prebarbork']
185+middle
186+[]
187+startmiddle
188+['startmiddleend']
189+middleend
190+[]
191+endstart
192+['end start', 'start']
193+startprobar
194+['startprebar', 'start prebar', 'startbar']
195+
196+test 6-6
197+# file: Xtest.utf-8.spl
198+bar
199+barbork
200+end
201+lead
202+meea1
203+meeaé
204+prebar
205+prebarbork
206+-------
207+bad
208+['bar', 'end', 'lead']
209+mee
210+['meea1', 'meeaé', 'bar']
211+meea2
212+['meea1', 'meeaé', 'lead']
213+prabar
214+['prebar', 'leadbar', 'bar']
215+probarbirk
216+['prebarbork']
217+middle
218+[]
219+leadmiddle
220+['leadmiddleend']
221+middleend
222+[]
223+endlead
224+['end lead', 'lead', 'end end']
225+leadprobar
226+['leadprebar', 'lead prebar', 'leadbar']
227+
228+test 7-7
229+# file: Xtest.utf-8.spl
230+bar
231+barmeat
232+lead
233+meea1
234+meeaé
235+prebar
236+prebarmeat
237+tail
238+-------
239+bad
240+['bar', 'lead', 'tail']
241+mee
242+['meea1', 'meeaé', 'bar']
243+meea2
244+['meea1', 'meeaé', 'lead']
245+prabar
246+['prebar', 'leadbar', 'bar']
247+probarmaat
248+['prebarmeat']
249+middle
250+[]
251+leadmiddle
252+[]
253+middletail
254+[]
255+taillead
256+['tail lead', 'tail']
257+leadprobar
258+['leadprebar', 'lead prebar', 'leadbar']
diff -r 4772a5e3f9fa -r ce2181d14aa0 src/version.h
--- a/src/version.h Mon Aug 29 22:25:38 2005 +0000
+++ b/src/version.h Tue Aug 30 21:55:26 2005 +0000
@@ -36,5 +36,5 @@
3636 #define VIM_VERSION_NODOT "vim70aa"
3737 #define VIM_VERSION_SHORT "7.0aa"
3838 #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
39-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 29)"
40-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 29, compiled "
39+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 30)"
40+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 30, compiled "
Show on old repository browser