diff options
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/digraph.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 20 | ||||
| -rw-r--r-- | runtime/doc/insert.txt | 28 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/pattern.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/pi_netrw.txt | 47 | ||||
| -rw-r--r-- | runtime/doc/quickref.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/spell.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/tags | 14 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 30 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 24 |
12 files changed, 143 insertions, 55 deletions
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index 201d6a0e5..c75708ebc 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1,4 +1,4 @@ -*digraph.txt* For Vim version 7.0aa. Last change: 2005 Mar 06 +*digraph.txt* For Vim version 7.0aa. Last change: 2005 Sep 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -166,7 +166,8 @@ EURO Exception: RFC1345 doesn't specify the euro sign. In Vim the digraph =e was added for this. Note the difference between latin1, where the digraph Cu is used for the currency sign, and latin9 (iso-8859-15), where the digraph =e is -used for the euro sign, while both of them are the character 164, 0xa4. +used for the euro sign, while both of them are the character 164, 0xa4. For +compatibility with zsh Eu can also be used for the euro sign. *digraph-table* char digraph hex dec official name ~ diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index c7fee8347..6e3d26cf5 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0aa. Last change: 2005 Sep 10 +*eval.txt* For Vim version 7.0aa. Last change: 2005 Sep 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1607,7 +1607,8 @@ repeat( {expr}, {count}) String repeat {expr} {count} times resolve( {filename}) String get filename a shortcut points to reverse( {list}) List reverse {list} in-place search( {pattern} [, {flags}]) Number search for {pattern} -searchdecl({name} [, {global}]) Number search for variable declaration +searchdecl({name} [, {global} [, {thisblock}]]) + Number search for variable declaration searchpair( {start}, {middle}, {end} [, {flags} [, {skip}]]) Number search for other end of start/end pair server2client( {clientid}, {string}) @@ -3730,10 +3731,17 @@ search({pattern} [, {flags}]) *search()* :endwhile < -searchdecl({name} [, {global}]) *searchdecl()* - Search for the declaration of {name}. Without {global} or - with a zero {global} argument this works like |gd|. With a - non-zero {global} argument it works like |gD|. +searchdecl({name} [, {global} [, {thisblock}]]) *searchdecl()* + Search for the declaration of {name}. + + With a non-zero {global} argument it works like |gD|, find + first match in the file. Otherwise it works like |gd|, find + first match in the function. + + With a non-zero {thisblock} argument matches in a {} block + that ends before the cursor position are ignored. Avoids + finding variable declarations only valid in another scope. + Moves the cursor to the found match. Returns zero for success, non-zero for failure. Example: > diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 324730556..97641079a 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.0aa. Last change: 2005 Sep 10 +*insert.txt* For Vim version 7.0aa. Last change: 2005 Sep 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -569,7 +569,7 @@ Completion can be done for: 8. definitions or macros |i_CTRL-X_CTRL-D| 9. Vim command-line |i_CTRL-X_CTRL-V| 10. User defined completion |i_CTRL-X_CTRL-U| -11. Occult completion |i_CTRL-X_CTRL-O| +11. omni completion |i_CTRL-X_CTRL-O| 12. Spelling suggestions |i_CTRL-X_s| 13. keywords in 'complete' |i_CTRL-N| @@ -674,6 +674,9 @@ at least two characters is matched. just type: printf("(%g, %g, %g)", vector[0], ^P[1], ^P[2]); +The search wraps around the end of the file, the value of 'wrapscan' is not +used here. + Multiple repeats of the same completion are skipped; thus a different match will be inserted at each CTRL-N and CTRL-P (unless there is only one matching keyword). @@ -882,13 +885,13 @@ CTRL-X CTRL-U Guess what kind of item is in front of the cursor and previous one. -Occult completion *compl-occult* +Omni completion *compl-omni* Completion is done by a function that can be defined by the user with the -'occultfunc' option. This is to be used for filetype-specific completion. +'omnifunc' option. This is to be used for filetype-specific completion. See the 'completefunc' help for how the function is called and an example. -For remarks about specific filetypes see |compl-occult-filetypes|. +For remarks about specific filetypes see |compl-omni-filetypes|. *i_CTRL-X_CTRL-O* CTRL-X CTRL-O Guess what kind of item is in front of the cursor and @@ -949,14 +952,14 @@ CTRL-P Find previous match for words that start with the other contexts unless a double CTRL-X is used. -Filetype-specific remarks for occult completion *compl-occult-filetypes* +Filetype-specific remarks for omni completion *compl-omni-filetypes* -C *ft-c-occult* +C *ft-c-omni* -Completion requires a tags file. You should use Exuberant ctags, because it -adds extra information that is needed for completion. You can find it here: -http://ctags.sourceforge.net/ -For version 5.5.4 you need to add a patch that adds the "typename:" field: +Completion of C code requires a tags file. You should use Exuberant ctags, +because it adds extra information that is needed for completion. You can find +it here: http://ctags.sourceforge.net/ +For version 5.5.4 you should add a patch that adds the "typename:" field: ftp://ftp.vim.org/pub/vim/unstable/patches/ctags-5.5.4.patch If you want to complete system functions you can do something like this. Use @@ -974,6 +977,9 @@ When using CTRL-X CTRL-O after something that has "." or "->" Vim will attempt to recognize the type of the variable and figure out what members it has. This means only members valid for the variable will be listed. +When a member name already was complete, CTRL-X CTRL-O will add a "." or +"->" for composite types. + Vim doesn't include a C compiler, only the most obviously formatted declarations are recognized. Preprocessor stuff may cause confusion. When the same structure name appears in multiple places all possible members diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 91076157f..7cc817043 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2005 Sep 10 +*options.txt* For Vim version 7.0aa. Last change: 2005 Sep 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -19,7 +19,7 @@ achieve special effects. These options come in three forms: string has a string value ============================================================================== -1. Setting options *set-option* +1. Setting options *set-option* *E764* *:se* *:set* :se[t] Show all options that differ from their default value. @@ -4602,8 +4602,8 @@ A jump table for the options with a short description can be found at |Q_op|. The minimum value is 1, the maximum value is 10. NOTE: 'numberwidth' is reset to 8 when 'compatible' is set. - *'occultfunc'* *'ofu'* -'occultfunc' 'ofu' string (default: empty) + *'omnifunc'* *'ofu'* +'omnifunc' 'ofu' string (default: empty) local to buffer {not in Vi} {not available when compiled without the +eval diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 84e9bf517..2cc592189 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 7.0aa. Last change: 2005 Aug 18 +*pattern.txt* For Vim version 7.0aa. Last change: 2005 Sep 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -117,6 +117,14 @@ gD Goto global Declaration. When the cursor is on a like "gd", except that the search for the keyword always starts in line 1. {not in Vi} + *1gd* +1gd Like "gd", but ignore matches inside a {} block that + ends before the cursor position. {not in Vi} + + *1gD* +1gD Like "gD", but ignore matches inside a {} block that + ends before the cursor position. {not in Vi} + *CTRL-C* CTRL-C Interrupt current (search) command. Use CTRL-Break on MS-DOS |dos-CTRL-Break|. diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index e5696e75f..4d446f692 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 7.0. Last change: Sep 07, 2005 +*pi_netrw.txt* For Vim version 7.0. Last change: Sep 12, 2005 VIM REFERENCE MANUAL by Charles E. Campbell, Jr. @@ -333,6 +333,7 @@ after one has set it. Unfortunately there doesn't appear to be a way for netrw to feed a password to scp. Thus every transfer via scp will require re-entry of the password. +However, |netrw-listhack| can help with this problem. ============================================================================== @@ -341,20 +342,27 @@ scp. Thus every transfer via scp will require re-entry of the password. Network-oriented file transfers are available by default whenever |'nocompatible'| mode is enabled. The <netrw.vim> file resides in your system's vim-plugin directory and is sourced automatically whenever you bring -up vim. - +up vim. I suggest that, at a minimum, you have at least the following in your +<.vimrc> customization file: > + set nocp + if version >= 600 + filetype plugin indent on + endif +< ============================================================================== 4. Transparent File Transfer *netrw-transparent* Transparent file transfers occur whenever a regular file read or write (invoked via an |:autocmd| for |BufReadCmd| or |BufWriteCmd| events) is made. -Thus one may use files across networks as if they were local. > +Thus one may use files across networks just as simply as if they were local. > vim ftp://[user@]machine/path ... :wq +See |netrw-activate| for more on how to encourage your vim to use plugins +such as netrw. ============================================================================== 5. Ex Commands *netrw-ex* @@ -368,8 +376,7 @@ additional commands available. :[range]Nw {netfile} [{netfile}]... Write the specified lines to the {netfile}. -:Nread - Read the specified lines into the current +:Nread Read the specified lines into the current buffer from the file specified in b:netrw_lastfile. @@ -400,10 +407,11 @@ additional commands available. The script <netrw.vim> uses several variables which can affect <netrw.vim>'s behavior. These variables typically may be set in the user's <.vimrc> file: -> - ------------- - Netrw Options - ------------- +(also see |netrw-settings|) > + + ------------- + Netrw Options + ------------- Option Meaning -------------- ----------------------------------------------- < @@ -859,7 +867,21 @@ OBTAINING A FILE *netrw-O* When browsing a remote directory, one may obtain a file under the cursor (ie. get a copy on your local machine, but not edit it) by pressing the O key. Only ftp and scp are supported for this operation (but since these two are -available for browsing, that shouldn't be a problem). +available for browsing, that shouldn't be a problem). The status bar +will then show, on its right hand side, a message like "Obtaining filename". +The statusline will be restored after the transfer is complete. + +Netrw can also "obtain" a file using the local browser. Netrw's display +of a directory is not necessarily the same as Vim's "current directory", +unless |g:netrw_keepdir| is set to 0 in the user's <.vimrc>. One may select +a file using the local browser (by putting the cursor on it) and pressing +"O" will then "obtain" the file; ie. copy it to Vim's current directory. + +Related topics: + * To see what the current directory is, use |:pwd| + * To make the currently browsed directory the current directory, see |netrw-c| + * To automatically make the currently browsed directory the current + directory, see |g:netrw_keepdir|. THIN, LONG, AND WIDE LISTINGS *netrw-i* @@ -1257,6 +1279,9 @@ which is loaded automatically at startup (assuming :set nocp). ============================================================================== 10. History *netrw-history* + v70: * when using |netrw-O|, the "Obtaining filename" message is now + shown using |hl-User9|. If User9 has not been defined, netrw + will define it. v69: * Bugfix: win95/98 machines were experiencing a "E121: Undefined variable: g:netrw_win95ftp" message v68: * double-click-leftmouse selects word under mouse diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index c8597a6d5..f4610ae8b 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.0aa. Last change: 2005 Sep 01 +*quickref.txt* For Vim version 7.0aa. Last change: 2005 Sep 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -772,7 +772,7 @@ Short explanation of each option: *option-list* |'nrformats'| |'nf'| number formats recognized for CTRL-A command |'number'| |'nu'| print the line number in front of each line |'numberwidth'| |'nuw'| number of columns used for the line number -|'occultfunc'| |'ofu'| function for filetype-specific completion +|'omnifunc'| |'ofu'| function for filetype-specific completion |'osfiletype'| |'oft'| operating system-specific filetype information |'paragraphs'| |'para'| nroff macros that separate paragraphs |'paste'| allow pasting text diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 49f727dfd..d2fa97629 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.0aa. Last change: 2005 Aug 30 +*spell.txt* For Vim version 7.0aa. Last change: 2005 Sep 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -60,7 +60,7 @@ To search for the next misspelled word: [S Like "]S" but search backwards. -To add words to your own word list: *E764* +To add words to your own word list: *zg* zg Add word under the cursor as a good word to the first diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index f3210ea7d..2a12894f8 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.0aa. Last change: 2005 Aug 30 +*syntax.txt* For Vim version 7.0aa. Last change: 2005 Sep 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3969,7 +3969,7 @@ WarningMsg warning messages *hl-WildMenu* WildMenu current match in 'wildmenu' completion - *hl-User1* *hl-User1..9* + *hl-User1* *hl-User1..9* *hl-User9* The 'statusline' syntax allows the use of 9 different highlights in the statusline and ruler (via 'rulerformat'). The names are User1 to User9. diff --git a/runtime/doc/tags b/runtime/doc/tags index 3c95458a3..4dc041485 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -607,9 +607,9 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'number' options.txt /*'number'* 'numberwidth' options.txt /*'numberwidth'* 'nuw' options.txt /*'nuw'* -'occultfunc' options.txt /*'occultfunc'* 'oft' options.txt /*'oft'* 'ofu' options.txt /*'ofu'* +'omnifunc' options.txt /*'omnifunc'* 'op' vi_diff.txt /*'op'* 'open' vi_diff.txt /*'open'* 'optimize' vi_diff.txt /*'optimize'* @@ -1484,6 +1484,8 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 12.6 usr_12.txt /*12.6* 12.7 usr_12.txt /*12.7* 12.8 usr_12.txt /*12.8* +1gD pattern.txt /*1gD* +1gd pattern.txt /*1gd* 20.1 usr_20.txt /*20.1* 20.2 usr_20.txt /*20.2* 20.3 usr_20.txt /*20.3* @@ -3752,7 +3754,7 @@ E760 spell.txt /*E760* E761 spell.txt /*E761* E762 spell.txt /*E762* E763 spell.txt /*E763* -E764 spell.txt /*E764* +E764 options.txt /*E764* E765 options.txt /*E765* E766 eval.txt /*E766* E767 eval.txt /*E767* @@ -4460,8 +4462,8 @@ compl-filename insert.txt /*compl-filename* compl-function insert.txt /*compl-function* compl-generic insert.txt /*compl-generic* compl-keyword insert.txt /*compl-keyword* -compl-occult insert.txt /*compl-occult* -compl-occult-filetypes insert.txt /*compl-occult-filetypes* +compl-omni insert.txt /*compl-omni* +compl-omni-filetypes insert.txt /*compl-omni-filetypes* compl-spelling insert.txt /*compl-spelling* compl-tag insert.txt /*compl-tag* compl-vim insert.txt /*compl-vim* @@ -4962,7 +4964,7 @@ ft-aspperl-syntax syntax.txt /*ft-aspperl-syntax* ft-aspvbs-syntax syntax.txt /*ft-aspvbs-syntax* ft-bash-syntax syntax.txt /*ft-bash-syntax* ft-basic-syntax syntax.txt /*ft-basic-syntax* -ft-c-occult insert.txt /*ft-c-occult* +ft-c-omni insert.txt /*ft-c-omni* ft-c-syntax syntax.txt /*ft-c-syntax* ft-ch-syntax syntax.txt /*ft-ch-syntax* ft-changelog-plugin filetype.txt /*ft-changelog-plugin* @@ -5363,6 +5365,7 @@ hl-Title syntax.txt /*hl-Title* hl-Tooltip syntax.txt /*hl-Tooltip* hl-User1 syntax.txt /*hl-User1* hl-User1..9 syntax.txt /*hl-User1..9* +hl-User9 syntax.txt /*hl-User9* hl-VertSplit syntax.txt /*hl-VertSplit* hl-Visual syntax.txt /*hl-Visual* hl-VisualNOS syntax.txt /*hl-VisualNOS* @@ -5977,6 +5980,7 @@ new-multi-byte version5.txt /*new-multi-byte* new-multi-lang version6.txt /*new-multi-lang* new-netrw-explore version7.txt /*new-netrw-explore* new-network-files version6.txt /*new-network-files* +new-omni-completion version7.txt /*new-omni-completion* new-operator-mod version6.txt /*new-operator-mod* new-options-5.2 version5.txt /*new-options-5.2* new-options-5.4 version5.txt /*new-options-5.4* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 5feaf699d..ab14fb86d 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2005 Sep 10 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Sep 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -31,10 +31,12 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. -------------------- Known bugs and current work ----------------------- ccomplete: -- When a typedef or struct is local to a file only use it in that file? - How to use a popup menu? -- when a struct reference is already complete and CTRL-X CTRL-O is used, add a - "." or "->"? +- When a typedef or struct is local to a file only use it in that file? + +When 'foldcolumn' is 1 show more + to be able to open all folds? (Donohue) + +After vi" another i" should include the quotes. Mac unicode patch (Da Woon Jung): - selecting proportional font breaks display @@ -63,21 +65,27 @@ Awaiting response: PLANNED FOR VERSION 7.0: -- Occult completion: Understands the programming language and finds matches +- Omni completion: Understands the programming language and finds matches that make sense. Esp. members of classes/structs. It's not much different from other Insert-mode completion, use the same - mechanism. Use CTRL-X CTRL-O and 'occultfunc'. Set 'occultfunc' in the + mechanism. Use CTRL-X CTRL-O and 'omnifunc'. Set 'omnifunc' in the filetype plugin, define the function in the autoload directory. Separately develop the completion logic and the UI. When adding UI stuff make it work for all completion methods. UI: - - At first: use 'wildmenu' kind of thing. - - Nicer: Display the list of choices right under the place where they + - Display the list of choices right under the place where they would be inserted in a kind of meny (use scrollbar when there are many alternatives). + At first in a terminal, then add GUI implementations. + - When using tags, show match in preview window (function prototype, + struct member, etc.). + Or use one window for matches, another for context/info (Doug Kearns, + 2005 Sep 13) + - Ideas on: http://www.wholetomato.com/ + Completion logic: Use runtime/autoload/{filetype}complete.vim files. @@ -92,6 +100,12 @@ PLANNED FOR VERSION 7.0: complist[0]['helpfunc'] = function that shows help text etc. + Can CTRL-] (jump to tag) include the "." and "->" to restrict the + number of possible matches? (Flemming Madsen) + + In general: Besides completion, figure out the type of a variable + and use it for information. + Ideas from others: http://www.vim.org/scripts/script.php?script_id=747 http://sourceforge.net/projects/insenvim diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 0a6923348..ce0b32b4b 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0aa. Last change: 2005 Sep 10 +*version7.txt* For Vim version 7.0aa. Last change: 2005 Sep 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -20,6 +20,7 @@ NEW FEATURES |new-7| Vim script enhancements |new-vim-script| Spell checking |new-spell| +Omni completion |new-omni-completion| KDE support |new-KDE| MzScheme interface |new-MzScheme| Printing multi-byte text |new-print-multi-byte| @@ -180,6 +181,22 @@ highlighting. Much more info here: |spell|. +Omni completion *new-omni-completion* +----------------- + +This could also be called "intellisense", but that is a trademark. It is a +smart kind of completion. The text in front of the cursor is inspected to +figure out what could be following. This considers struct and class members, +unions, etc. + +Use CTRL-X CTRL-O in Insert mode to start the completion. |i_CTRL-X_CTRL-O| + +The 'omnifunc' option is set by filetype plugins to define the function that +figures out the completion. + +Currently only C is supported. |ft-c-omni| + + KDE support *new-KDE* ----------- @@ -349,6 +366,7 @@ Options: ~ 'completefunc' The name of a function used for user-specified Insert mode completion. CTRL-X CTRL-U can be used in Insert mode to do any kind of completion. (Taro Muraoka) +'omnifunc' The name of a function used for omni completion. 'quoteescape' Characters used to escape quotes inside a string. Used for the a", a' and a` text objects. |a'| 'numberwidth' Minimal width of the space used for the 'number' @@ -450,6 +468,7 @@ New functions: ~ |remove()| remove one or more items from a List or Dictionary |repeat()| repeat "expr" "count" times (Christophe Poucet) |reverse()| reverse the order of a List +|searchdecl()| search for declaration of variable |setqflist()| create a quickfix list (Yegappan Lakshmanan) |sort()| sort a List |soundfold()| get the sound-a-like equivalent of a word @@ -576,6 +595,9 @@ When 'verbose' is set the output of the ":map", ":abbreviate", ":command", ":function /pattern" lists functions matching the pattern. +"1gd" can be used like "gd" but ignores matches in a {} block that ends before +the cursor position. Likewise for "1gD" and "gD". + ============================================================================== IMPROVEMENTS *improvements-7* |