From 30b658179962cc3c9f0a98f071b36b09a36c2b94 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 12 Jul 2012 22:01:11 +0200 Subject: Updated runtime files. --- runtime/doc/options.txt | 53 +++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 21 deletions(-) (limited to 'runtime/doc/options.txt') diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index f1920bfd1..a31ae3d16 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2012 May 16 +*options.txt* For Vim version 7.3. Last change: 2012 Jul 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1107,8 +1107,8 @@ A jump table for the options with a short description can be found at |Q_op|. Vim does not try to send a message to an external debugger (Netbeans or Sun Workshop). - The expression may be evaluated in the |sandbox|, see - |sandbox-option|. + The expression will be evaluated in the |sandbox| when set from a + modeline, see |sandbox-option|. It is not allowed to change text or jump to another window while evaluating 'balloonexpr' |textlock|. @@ -1462,6 +1462,7 @@ A jump table for the options with a short description can be found at |Q_op|. explicitly accessed using the "* notation. Also see |gui-clipboard|. + *clipboard-unnamedplus* unnamedplus A variant of "unnamed" flag which uses the clipboard register '+' (|quoteplus|) instead of register '*' for all operations except yank. Yank shall copy the text @@ -1471,6 +1472,7 @@ A jump table for the options with a short description can be found at |Q_op|. Availability can be checked with: > if has('unnamedplus') < + *clipboard-autoselect* autoselect Works like the 'a' flag in 'guioptions': If present, then whenever Visual mode is started, or the Visual area extended, Vim tries to become the owner of the @@ -3049,8 +3051,8 @@ A jump table for the options with a short description can be found at |Q_op|. The expression used for when 'foldmethod' is "expr". It is evaluated for each line to obtain its fold level. See |fold-expr|. - The expression may be evaluated in the |sandbox|, see - |sandbox-option|. + The expression will be evaluated in the |sandbox| if set from a + modeline, see |sandbox-option|. This option can't be set from a |modeline| when the 'diff' option is on. @@ -3192,8 +3194,8 @@ A jump table for the options with a short description can be found at |Q_op|. An expression which is used to specify the text displayed for a closed fold. See |fold-foldtext|. - The expression may be evaluated in the |sandbox|, see - |sandbox-option|. + The expression will be evaluated in the |sandbox| if set from a + modeline, see |sandbox-option|. It is not allowed to change text or jump to another window while evaluating 'foldtext' |textlock|. @@ -3238,8 +3240,8 @@ A jump table for the options with a short description can be found at |Q_op|. format function will be used |C-indenting|. Environment variables are expanded |:set_env|. See |option-backslash| about including spaces and backslashes. - The expression may be evaluated in the |sandbox|, see - |sandbox-option|. + This option cannot be set from a |modeline| or in the |sandbox|, for + security reasons. *'formatexpr'* *'fex'* 'formatexpr' 'fex' string (default "") @@ -3272,9 +3274,9 @@ A jump table for the options with a short description can be found at |Q_op|. When the expression evaluates to non-zero Vim will fall back to using the internal format mechanism. - The expression may be evaluated in the |sandbox|, see - |sandbox-option|. That stops the option from working, since changing - the buffer text is not allowed. + The expression will be evaluated in the |sandbox| when set from a + modeline, see |sandbox-option|. That stops the option from working, + since changing the buffer text is not allowed. *'fsync'* *'fs'* 'fsync' 'fs' boolean (default on) @@ -4098,8 +4100,8 @@ A jump table for the options with a short description can be found at |Q_op|. found. Allows doing "gf" on the name after an 'include' statement. Also used for ||. - The expression may be evaluated in the |sandbox|, see - |sandbox-option|. + The expression will be evaluated in the |sandbox| when set from a + modeline, see |sandbox-option|. It is not allowed to change text or jump to another window while evaluating 'includeexpr' |textlock|. @@ -4163,8 +4165,8 @@ A jump table for the options with a short description can be found at |Q_op|. See |indent-expression|. NOTE: This option is made empty when 'compatible' is set. - The expression may be evaluated in the |sandbox|, see - |sandbox-option|. + The expression will be evaluated in the |sandbox| when set from a + modeline, see |sandbox-option|. It is not allowed to change text or jump to another window while evaluating 'indentexpr' |textlock|. @@ -4593,24 +4595,31 @@ A jump table for the options with a short description can be found at |Q_op|. {not in Vi} Strings to use in 'list' mode and for the |:list| command. It is a comma separated list of string settings. + *lcs-eol* eol:c Character to show at the end of each line. When omitted, there is no extra character at the end of the line. + *lcs-tab* tab:xy Two characters to be used to show a tab. The first char is used once. The second char is repeated to fill the space that the tab normally occupies. "tab:>-" will show a tab that takes four spaces as ">---". When omitted, a tab is show as ^I. + *lcs-trail* trail:c Character to show for trailing spaces. When omitted, trailing spaces are blank. + *lcs-extends* extends:c Character to show in the last column, when 'wrap' is off and the line continues beyond the right of the screen. + *lcs-precedes* precedes:c Character to show in the first column, when 'wrap' is off and there is text preceding the character visible in the first column. + *lcs-conceal* conceal:c Character to show in place of concealed text, when 'conceallevel' is set to 1. + *lcs-nbsp* nbsp:c Character to show for a non-breakable space (character 0xA0, 160). Left blank when omitted. @@ -5131,6 +5140,8 @@ A jump table for the options with a short description can be found at |Q_op|. invoked and what it should return. This option is usually set by a filetype plugin: |:filetype-plugin-on| + This option cannot be set from a |modeline| or in the |sandbox|, for + security reasons. *'opendevice'* *'odev'* *'noopendevice'* *'noodev'* @@ -6692,8 +6703,8 @@ A jump table for the options with a short description can be found at |Q_op|. The variable "actual_curbuf" is set to the 'bufnr()' number of the real current buffer. - The 'statusline' option may be evaluated in the |sandbox|, see - |sandbox-option|. + The 'statusline' option will be evaluated in the |sandbox| if set from + a modeline, see |sandbox-option|. It is not allowed to change text or jump to another window while evaluating 'statusline' |textlock|. @@ -7853,9 +7864,9 @@ A jump table for the options with a short description can be found at |Q_op|. {not available when compiled without the |+wildignore| feature} A list of file patterns. A file that matches with one of these - patterns is ignored when completing file or directory names, and - influences the result of |expand()|, |glob()| and |globpath()| unless - a flag is passed to disable this. + patterns is ignored when expanding |wildcards|, completing file or + directory names, and influences the result of |expand()|, |glob()| and + |globpath()| unless a flag is passed to disable this. The pattern is used like with |:autocmd|, see |autocmd-patterns|. Also see 'suffixes'. Example: > -- cgit v1.2.3