diff options
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/cmdline.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 68 | ||||
| -rw-r--r-- | runtime/doc/insert.txt | 11 | ||||
| -rw-r--r-- | runtime/doc/tags | 10 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 17 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 5 |
6 files changed, 91 insertions, 30 deletions
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index d1764affb..1ea512e60 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.0aa. Last change: 2005 Jul 05 +*cmdline.txt* For Vim version 7.0aa. Last change: 2005 Sep 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -153,6 +153,7 @@ CTRL-R {0-9a-z"%#:-=.} *c_CTRL-R* *c_<C-R>* *c_CTRL-R_=* '=' the expression register: you are prompted to enter an expression (see |expression|) + (doesn't work at the expression prompt) See |registers| about registers. {not in Vi} Implementation detail: When using the |expression| register and invoking setcmdpos(), this sets the position before @@ -191,7 +192,8 @@ CTRL-\ e {expr} *c_CTRL-\_e* to finish it. It's most useful in mappings though. See |expression|. See |c_CTRL-R_=| for inserting the result of an expression. - Useful functions are |getcmdline()| and |getcmdpos()|. + Useful functions are |getcmdtype()|, |getcmdline()| and + |getcmdpos()|. The cursor position is unchanged, except when the cursor was at the end of the line, then it stays at the end. |setcmdpos()| can be used to set the cursor position. @@ -203,7 +205,9 @@ CTRL-\ e {expr} *c_CTRL-\_e* :call setcmdpos(strlen(cmd)) :return cmd :endfunc -< +< This doesn't work recursively, thus not when already editing + an expression. + *c_CTRL-Y* CTRL-Y When there is a modeless selection, copy the selection into the clipboard. |modeless-selection| diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 368b44474..ed6ee899a 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 15 +*eval.txt* For Vim version 7.0aa. Last change: 2005 Sep 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1520,6 +1520,7 @@ getcharmod( ) Number modifiers for the last typed character getbufvar( {expr}, {varname}) variable {varname} in buffer {expr} getcmdline() String return the current command-line getcmdpos() Number return cursor position in command-line +getcmdtype() String return the current command-line type getcwd() String the current working directory getfperm( {fname}) String file permissions of file {fname} getfsize( {fname}) Number size in bytes of file {fname} @@ -1550,7 +1551,8 @@ iconv( {expr}, {from}, {to}) String convert encoding of {expr} indent( {lnum}) Number indent of line {lnum} index( {list}, {expr} [, {start} [, {ic}]]) Number index in {list} where {expr} appears -input( {prompt} [, {text}]) String get input from the user +input( {prompt} [, {text} [, {completion}]]) + String get input from the user inputdialog( {p} [, {t} [, {c}]]) String like input() but in a GUI dialog inputrestore() Number restore typeahead inputsave() Number save and clear typeahead @@ -2533,14 +2535,27 @@ getcmdline() *getcmdline()* |c_CTRL-R_=|. Example: > :cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR> -< Also see |getcmdpos()| and |setcmdpos()|. +< Also see |getcmdtype()|, |getcmdpos()| and |setcmdpos()|. getcmdpos() *getcmdpos()* Return the position of the cursor in the command line as a byte count. The first column is 1. Only works when editing the command line, thus requires use of |c_CTRL-\_e| or |c_CTRL-R_=|. Returns 0 otherwise. - Also see |setcmdpos()| and |getcmdline()|. + Also see |getcmdtype()|, |setcmdpos()| and |getcmdline()|. + +getcmdtype() *getcmdtype()* + Return the current command-line type. Possible return values + are: + / Search forward command + ? Search backward command + : Ex-command mode + @ Input mode + > Debug mode + Only works when editing the command line, thus requires use of + |c_CTRL-\_e| or |c_CTRL-R_=|. Returns an empty string + otherwise. + Also see |getcmdpos()|, |setcmdpos()| and |getcmdline()|. *getcwd()* getcwd() The result is a String, which is the name of the current @@ -2910,19 +2925,34 @@ index({list}, {expr} [, {start} [, {ic}]]) *index()* :if index(numbers, 123) >= 0 -input({prompt} [, {text}]) *input()* +input({prompt} [, {text} [, {completion}]]) *input()* The result is a String, which is whatever the user typed on the command-line. The parameter is either a prompt string, or a blank string (for no prompt). A '\n' can be used in the - prompt to start a new line. The highlighting set with - |:echohl| is used for the prompt. The input is entered just - like a command-line, with the same editing commands and - mappings. There is a separate history for lines typed for - input(). + prompt to start a new line. + The highlighting set with |:echohl| is used for the prompt. + The input is entered just like a command-line, with the same + editing commands and mappings. There is a separate history + for lines typed for input(). + Example: > + :if input("Coffee or beer? ") == "beer" + : echo "Cheers!" + :endif +< If the optional {text} is present, this is used for the - default reply, as if the user typed this. - NOTE: This must not be used in a startup file, for the - versions that only run in GUI mode (e.g., the Win32 GUI). + default reply, as if the user typed this. Example: > + :let color = input("Color? ", "white") + +< The optional {completion} argument specifies the type of + completion supported for the input. Without it completion is + not performed. The supported completion types are the same as + that can be supplied to a user-defined command using the + "-complete=" argument. Refer to |:command-completion| for + more information. Example: > + let fname = input("File: ", "", "file") +< + NOTE: This function must not be used in a startup file, for + the versions that only run in GUI mode (e.g., the Win32 GUI). Note: When input() is called from within a mapping it will consume remaining characters from that mapping, because a mapping is handled like the characters were typed. @@ -2931,13 +2961,7 @@ input({prompt} [, {text}]) *input()* that further characters follow in the mapping, e.g., by using |:execute| or |:normal|. - Example: > - :if input("Coffee or beer? ") == "beer" - : echo "Cheers!" - :endif -< Example with default text: > - :let color = input("Color? ", "white") -< Example with a mapping: > + Example with a mapping: > :nmap \x :call GetFoo()<CR>:exe "/" . Foo<CR> :function GetFoo() : call inputsave() @@ -2957,6 +2981,7 @@ inputdialog({prompt} [, {text} [, {cancelreturn}]]) *inputdialog()* omitted an empty string is returned. Hitting <Enter> works like pressing the OK button. Hitting <Esc> works like pressing the Cancel button. + NOTE: Command-line completion is not supported. inputlist({textlist}) *inputlist()* {textlist} must be a list of strings. This list is displayed, @@ -2996,6 +3021,7 @@ inputsecret({prompt} [, {text}]) *inputsecret()* |history| stack. The result is a String, which is whatever the user actually typed on the command-line in response to the issued prompt. + NOTE: Command-line completion is not supported. insert({list}, {item} [, {idx}]) *insert()* Insert {item} at the start of List {list}. @@ -4450,6 +4476,8 @@ winheight({nr}) *winheight()* winline() The result is a Number, which is the screen line of the cursor in the window. This is counting screen lines from the top of the window. The first line is one. + If the cursor was moved the view on the file will be updated + first, this may cause a scroll. *winnr()* winnr([{arg}]) The result is a Number, which is the number of the current diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index ffbb7a3da..30fe2d4f1 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 15 +*insert.txt* For Vim version 7.0aa. Last change: 2005 Sep 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -990,16 +990,17 @@ are included. When using after CTRL-X CTRL-O after "<" it is completed with tag name available in current context. Inside of tag completion aids to choose -proper attributes, and when possible choose appropriate attribute value. +proper attributes, and when possible choose appropriate attribute value +including class names for CSS styles. When used after "</" CTRL-X CTRL-O will close the last opened tag. -File htmlcompletion.vim provides through autoload mechanism +File htmlcomplete.vim provides through |autoload| mechanism GetLastOpenTag function which can be used in XML files to get name of last open tag with: > - :echo htmlcompletion#GetLastOpenTag("b:unaryTagsStack") -< + :echo htmlcomplete#GetLastOpenTag("b:unaryTagsStack") + ============================================================================== 8. Insert mode commands *inserting* diff --git a/runtime/doc/tags b/runtime/doc/tags index 451212233..cc4d2a8a7 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4992,6 +4992,7 @@ ft-fvwm-syntax syntax.txt /*ft-fvwm-syntax* ft-groff-syntax syntax.txt /*ft-groff-syntax* ft-gsp-syntax syntax.txt /*ft-gsp-syntax* ft-haskell-syntax syntax.txt /*ft-haskell-syntax* +ft-html-omni insert.txt /*ft-html-omni* ft-html-syntax syntax.txt /*ft-html-syntax* ft-htmlos-syntax syntax.txt /*ft-htmlos-syntax* ft-ia64-syntax syntax.txt /*ft-ia64-syntax* @@ -5163,6 +5164,7 @@ getchar() eval.txt /*getchar()* getcharmod() eval.txt /*getcharmod()* getcmdline() eval.txt /*getcmdline()* getcmdpos() eval.txt /*getcmdpos()* +getcmdtype() eval.txt /*getcmdtype()* getcwd() eval.txt /*getcwd()* getfontname() eval.txt /*getfontname()* getfperm() eval.txt /*getfperm()* @@ -5294,6 +5296,7 @@ hebrew hebrew.txt /*hebrew* hebrew.txt hebrew.txt /*hebrew.txt* help various.txt /*help* help-context help.txt /*help-context* +help-tags tags 1 help-translated various.txt /*help-translated* help-xterm-window various.txt /*help-xterm-window* help.txt help.txt /*help.txt* @@ -7319,6 +7322,13 @@ zf fold.txt /*zf* zg spell.txt /*zg* zh scroll.txt /*zh* zi fold.txt /*zi* +zip zip.txt /*zip* +zip-contents zip.txt /*zip-contents* +zip-copyright zip.txt /*zip-copyright* +zip-history zip.txt /*zip-history* +zip-manual zip.txt /*zip-manual* +zip-usage zip.txt /*zip-usage* +zip.txt zip.txt /*zip.txt* zj fold.txt /*zj* zk fold.txt /*zk* zl scroll.txt /*zl* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index cbd77d0ae..6f353bc71 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 16 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Sep 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -32,6 +32,20 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. Test11 fails sometimes. (athena, huge features) +ml_get errors: :%s/^\_s\+$//gc +And: Insert mode in one window, long file, click in other window, short file. + +'scrolljump' negative used as a percentage, e.g. -50 is 50% of window height? + +Spelling: +- suggestion for "a an" includes "an an", which is marked bad. Check + suggestions for not being a bad word (when split)? +- CTRL-X s doesn't consider 'spellcapcheck'. +- Have spellbadword() return a list with bad word and reason it's bad? + (rare/local/bad/caps) +- spellsuggest() needs a way to require a capital. A flag or context? +- Underscore in REP items stands for space. + ccomplete: - How to use a popup menu? - When a typedef or struct is local to a file only use it in that file? @@ -1726,7 +1740,6 @@ Built-in script language: filecopy(from, to) Copy a file shorten(fname) shorten a file name, like home_replace() perl(cmd) call Perl and return string - input(prompt, complete) like input() but do specified completion inputrl() like input() but right-to-left virtualmode() add argument to obtain whether "$" was used in Visual block mode. diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index e4e981bb6..d9845715e 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -447,6 +447,8 @@ New functions: ~ |get()| get an item from a List or Dictionary |getbufline()| get a list of lines from a specified buffer (Yegappan Lakshmanan) +|getcmdtype()| return the current command-line type + (Yegappan Lakshmanan) |getfontname()| get actual font name being used |getfperm()| get file permission string (Nikolai Weibull) |getftype()| get type of file (Nikolai Weibull) @@ -812,6 +814,9 @@ Also support t_SI and t_EI on Unix with normal features. (Ciaran McCreesh) When 'foldcolumn' is one then put as much info in it as possible. This allows closing a fold with the mouse by clicking on the '-'. +input() takes an optional completion argument to specify the type of +completion supported for the input. (Yegappan Lakshmanan) + ============================================================================== COMPILE TIME CHANGES *compile-changes-7* |