diff options
| -rw-r--r-- | runtime/doc/eval.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 13 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 2 | ||||
| -rw-r--r-- | runtime/synmenu.vim | 52 |
4 files changed, 38 insertions, 33 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 107dd28ecd..90575e3438 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -3044,6 +3044,8 @@ delete({fname} [, {flags}]) *delete()* When {flags} is "rf": Deletes the directory by the name {fname} and everything in it, recursively. BE CAREFUL! + Note: on MS-Windows it is not possible to delete a directory + that is being used. The result is a Number, which is 0 if the delete operation was successful and -1 when the deletion failed or partly failed. @@ -6167,7 +6169,7 @@ rpcstop({channel}) {Nvim} *rpcstop()* connecting to |v:servername|. screenattr(row, col) *screenattr()* - Like screenchar(), but return the attribute. This is a rather + Like |screenchar()|, but return the attribute. This is a rather arbitrary number that can only be used to compare to the attribute at other positions. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 6b96271c4a..cef01eb27b 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2219,10 +2219,15 @@ A jump table for the options with a short description can be found at |Q_op|. *'exrc'* *'ex'* *'noexrc'* *'noex'* 'exrc' 'ex' boolean (default off) global - Enables the reading of .nvimrc and .exrc in the current directory. - If you switch this option on you should also consider setting the - 'secure' option (see |initialization|). Using this option comes - with a potential security risk, use with care! + Enables the reading of .vimrc and .exrc in the current directory. + Setting this option is a potential security leak. E.g., consider + unpacking a package or fetching files from github, a .vimrc in there + might be a trojan horse. BETTER NOT SET THIS OPTION! + Instead, define an autocommand in your .vimrc to set options for a + matching directory. + + If you do switch this option on you should also consider setting the + 'secure' option (see |initialization|). This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. Also see |init.vim| and |gui-init|. diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index c93c3d0741..f7c47125f1 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -425,7 +425,7 @@ accordingly. Vim proceeds in this order: - The environment variable EXINIT. The value of $EXINIT is used as an Ex command line. - c. If the 'exrc' option is on (which is not the default), the current + c. If the 'exrc' option is on (which is NOT the default), the current directory is searched for three files. The first that exists is used, the others are ignored. - The file ".nvimrc" (for Unix) diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim index 01dad3c7f2..81e3667298 100644 --- a/runtime/synmenu.vim +++ b/runtime/synmenu.vim @@ -61,7 +61,6 @@ an 50.10.320 &Syntax.AB.Ascii\ Doc :cal SetSyn("asciidoc")<CR> an 50.10.330 &Syntax.AB.ASP\ with\ VBScript :cal SetSyn("aspvbs")<CR> an 50.10.340 &Syntax.AB.ASP\ with\ Perl :cal SetSyn("aspperl")<CR> an 50.10.350 &Syntax.AB.Assembly.680x0 :cal SetSyn("asm68k")<CR> -an 50.10.355 &Syntax.AB.Assembly.AVR :cal SetSyn("avra")<CR> an 50.10.360 &Syntax.AB.Assembly.Flat :cal SetSyn("fasm")<CR> an 50.10.370 &Syntax.AB.Assembly.GNU :cal SetSyn("asm")<CR> an 50.10.380 &Syntax.AB.Assembly.GNU\ H-8300 :cal SetSyn("asmh8300")<CR> @@ -162,31 +161,31 @@ an 50.30.290 &Syntax.DE.Doxygen.C\ with\ doxygen :cal SetSyn("c.doxygen")<CR> an 50.30.300 &Syntax.DE.Doxygen.C++\ with\ doxygen :cal SetSyn("cpp.doxygen")<CR> an 50.30.310 &Syntax.DE.Doxygen.IDL\ with\ doxygen :cal SetSyn("idl.doxygen")<CR> an 50.30.320 &Syntax.DE.Doxygen.Java\ with\ doxygen :cal SetSyn("java.doxygen")<CR> -an 50.30.320 &Syntax.DE.Doxygen.DataScript\ with\ doxygen :cal SetSyn("datascript.doxygen")<CR> -an 50.30.330 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR> -an 50.30.340 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR> -an 50.30.350 &Syntax.DE.DTD :cal SetSyn("dtd")<CR> -an 50.30.360 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR> -an 50.30.370 &Syntax.DE.DTrace :cal SetSyn("dtrace")<CR> -an 50.30.380 &Syntax.DE.Dts/dtsi :cal SetSyn("dts")<CR> -an 50.30.390 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR> -an 50.30.400 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR> -an 50.30.410 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR> -an 50.30.430 &Syntax.DE.EDIF :cal SetSyn("edif")<CR> -an 50.30.440 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR> -an 50.30.450 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR> -an 50.30.460 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR> -an 50.30.470 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR> -an 50.30.480 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR> -an 50.30.490 &Syntax.DE.ESMTP\ rc :cal SetSyn("esmtprc")<CR> -an 50.30.500 &Syntax.DE.ESQL-C :cal SetSyn("esqlc")<CR> -an 50.30.510 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR> -an 50.30.520 &Syntax.DE.Esterel :cal SetSyn("esterel")<CR> -an 50.30.530 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR> -an 50.30.540 &Syntax.DE.Eviews :cal SetSyn("eviews")<CR> -an 50.30.550 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR> -an 50.30.560 &Syntax.DE.Expect :cal SetSyn("expect")<CR> -an 50.30.570 &Syntax.DE.Exports :cal SetSyn("exports")<CR> +an 50.30.330 &Syntax.DE.Doxygen.DataScript\ with\ doxygen :cal SetSyn("datascript.doxygen")<CR> +an 50.30.340 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR> +an 50.30.350 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR> +an 50.30.360 &Syntax.DE.DTD :cal SetSyn("dtd")<CR> +an 50.30.370 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR> +an 50.30.380 &Syntax.DE.DTrace :cal SetSyn("dtrace")<CR> +an 50.30.390 &Syntax.DE.Dts/dtsi :cal SetSyn("dts")<CR> +an 50.30.400 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR> +an 50.30.410 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR> +an 50.30.420 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR> +an 50.30.440 &Syntax.DE.EDIF :cal SetSyn("edif")<CR> +an 50.30.450 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR> +an 50.30.460 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR> +an 50.30.470 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR> +an 50.30.480 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR> +an 50.30.490 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR> +an 50.30.500 &Syntax.DE.ESMTP\ rc :cal SetSyn("esmtprc")<CR> +an 50.30.510 &Syntax.DE.ESQL-C :cal SetSyn("esqlc")<CR> +an 50.30.520 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR> +an 50.30.530 &Syntax.DE.Esterel :cal SetSyn("esterel")<CR> +an 50.30.540 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR> +an 50.30.550 &Syntax.DE.Eviews :cal SetSyn("eviews")<CR> +an 50.30.560 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR> +an 50.30.570 &Syntax.DE.Expect :cal SetSyn("expect")<CR> +an 50.30.580 &Syntax.DE.Exports :cal SetSyn("exports")<CR> an 50.40.100 &Syntax.FG.Falcon :cal SetSyn("falcon")<CR> an 50.40.110 &Syntax.FG.Fantom :cal SetSyn("fan")<CR> an 50.40.120 &Syntax.FG.Fetchmail :cal SetSyn("fetchmail")<CR> @@ -328,7 +327,6 @@ an 50.70.270 &Syntax.M.Messages\ (/var/log) :cal SetSyn("messages")<CR> an 50.70.280 &Syntax.M.Metafont :cal SetSyn("mf")<CR> an 50.70.290 &Syntax.M.MetaPost :cal SetSyn("mp")<CR> an 50.70.300 &Syntax.M.MGL :cal SetSyn("mgl")<CR> -an 50.70.305 &Syntax.M.MIX :cal SetSyn("mix")<CR> an 50.70.310 &Syntax.M.MMIX :cal SetSyn("mmix")<CR> an 50.70.320 &Syntax.M.Modconf :cal SetSyn("modconf")<CR> an 50.70.330 &Syntax.M.Model :cal SetSyn("model")<CR> |