diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-15 22:59:18 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-15 22:59:18 +0000 |
| commit | 7d47b6eed707db9af160ec517b71e1f9fdac1a0f (patch) | |
| tree | f93785b6fba72029e272fac10caed4cda5c09f4e /runtime/doc/options.txt | |
| parent | 5671873089d516a10c79733182797075071eb5f3 (diff) | |
| download | vim-git-7d47b6eed707db9af160ec517b71e1f9fdac1a0f.tar.gz | |
updated for version 7.0225
Diffstat (limited to 'runtime/doc/options.txt')
| -rw-r--r-- | runtime/doc/options.txt | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 52ae467b5..7e10b85d4 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2006 Mar 12 +*options.txt* For Vim version 7.0aa. Last change: 2006 Mar 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1624,6 +1624,8 @@ A jump table for the options with a short description can be found at |Q_op|. *'completeopt'* *'cot'* 'completeopt' 'cot' string (default: "menu,preview") global + {not available when compiled without the + |+insert_expand| feature} {not in Vi} A comma separated list of options for Insert mode completion |ins-completion|. The supported values are: @@ -1644,7 +1646,6 @@ A jump table for the options with a short description can be found at |Q_op|. preview Show extra information about the currently selected completion in the preview window. - *'confirm'* *'cf'* *'noconfirm'* *'nocf'* 'confirm' 'cf' boolean (default off) global @@ -2184,11 +2185,20 @@ A jump table for the options with a short description can be found at |Q_op|. exactly. It should ignore adding trailing white space, but not leading white space. + horizontal Start diff mode with horizontal splits (unless + explicitly specified otherwise). + + vertical Start diff mode with vertical splits (unless + explicitly specified otherwise). + + foldcolumn:{n} Set the 'foldcolumn' option to {n} when + starting diff mode. Without this 2 is used. + Examples: > :set diffopt=filler,context:4 :set diffopt= - :set diffopt=filler + :set diffopt=filler,foldcolumn:3 < *'digraph'* *'dg'* *'nodigraph'* *'nodg'* 'digraph' 'dg' boolean (default off) @@ -5019,6 +5029,17 @@ A jump table for the options with a short description can be found at |Q_op|. global When on a ":" prompt is used in Ex mode. + *'pumheight'* *'ph'* +'pumheight' 'ph' number (default 0) + global + {not available when compiled without the + |+insert_expand| feature} + {not in Vi} + Determines the maximum number of items to show in the popup menu. + When zero as much space as available is used. + |ins-completion-menu|. + + *'quoteescape'* *'qe'* 'quoteescape' 'qe' string (default "\") local to buffer |