diff options
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/eval.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/index.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/mbyte.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 30 | ||||
| -rw-r--r-- | runtime/doc/pi_netrw.txt | 52 | ||||
| -rw-r--r-- | runtime/doc/print.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/quickref.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/sponsor.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/tabpage.txt | 17 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/undo.txt | 7 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 21 | ||||
| -rw-r--r-- | runtime/doc/windows.txt | 10 |
13 files changed, 125 insertions, 45 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 80a0c1d54..4fff9d0a9 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0e. Last change: 2006 Apr 15 +*eval.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1369,9 +1369,9 @@ v:lc_time The current locale setting for time messages of the runtime *v:lnum* *lnum-variable* v:lnum Line number for the 'foldexpr' |fold-expr| and 'indentexpr' - expressions, tab page number for 'guitablabel'. Only valid - while one of these expressions is being evaluated. Read-only - when in the |sandbox|. + expressions, tab page number for 'guitablabel' and + 'guitabtooltip'. Only valid while one of these expressions is + being evaluated. Read-only when in the |sandbox|. *v:prevcount* *prevcount-variable* v:prevcount The count given for the last but one Normal mode command. diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 8fc3cef9c..77ebed95f 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -552,6 +552,9 @@ tag command action in Normal mode ~ |CTRL-W_g}| CTRL-W g } do a |:ptjump| to the tag under the cursor |CTRL-W_gf| CTRL-W g f edit file name under the cursor in a new tab page +|CTRL-W_gF| CTRL-W g F edit file name under the cursor in a new + tab page and jump to the line number + following the file name. |CTRL-W_h| CTRL-W h go to Nth left window (stop at first window) |CTRL-W_i| CTRL-W i split window and jump to declaration of identifier under the cursor diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index b660d2c77..44cbea903 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.0e. Last change: 2006 Apr 02 +*mbyte.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar et al. @@ -1035,7 +1035,7 @@ use a brightly colored cursor: > :highlight Cursor guifg=NONE guibg=Green :highlight lCursor guifg=NONE guibg=Cyan < - *keymap-file-format* *:loadk* *:loadkeymap* *E105* + *keymap-file-format* *:loadk* *:loadkeymap* *E105* *E791* The keymap file looks something like this: > " Maintainer: name <email@address> diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index beee11d9e..7bbd96949 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0e. Last change: 2006 Apr 20 +*options.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2092,12 +2092,16 @@ A jump table for the options with a short description can be found at |Q_op|. 'debug' string (default "") global {not in Vi} - When set to "msg", error messages that would otherwise be omitted will - be given anyway. This is useful when debugging 'foldexpr', - 'formatexpr' or 'indentexpr'. - When set to "beep", a message will be given when otherwise only a beep - would be produced. + These values can be used: + msg Error messages that would otherwise be omitted will be given + anyway. + throw Error messages that would otherwise be omitted will be given + anyway and also throw an exception and set |v:errmsg|. + beep A message will be given when otherwise only a beep would be + produced. The values can be combined, separated by a comma. + "msg" and "throw" are useful for debugging 'foldexpr', 'formatexpr' or + 'indentexpr'. *'define'* *'def'* 'define' 'def' string (default "^\s*#\s*define") @@ -3407,11 +3411,25 @@ A jump table for the options with a short description can be found at |Q_op|. |setting-guitablabel| for more info. The format of this option is like that of 'statusline'. + 'guitabtooltip' is used for the tooltip, see below. Only used when the GUI tab pages line is displayed. 'e' must be present in 'guioptions'. For the non-GUI tab pages line 'tabline' is used. + *'guitabtooltip'* *'gtt'* +'guitabtooltip' 'gtt' string (default empty) + global + {not in Vi} + {only available when compiled with GUI enabled and + with the +windows feature} + When nonempty describes the text to use in a tooltip for the GUI tab + pages line. When empty Vim will use a default tooltip. + This option is otherwise just like 'guitablabel' above. + + The tooltip only works for some systems. + + *'helpfile'* *'hf'* 'helpfile' 'hf' string (default (MSDOS) "$VIMRUNTIME\doc\help.txt" (others) "$VIMRUNTIME/doc/help.txt") diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 8cb8010fd..ee5995316 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 7.0e. Last change: Apr 12, 2006 +*pi_netrw.txt* For Vim version 7.0e. Last change: Apr 21, 2006 VIM REFERENCE MANUAL by Charles E. Campbell, Jr. @@ -782,7 +782,7 @@ NETRW BROWSER VARIABLES *netrw-browse-var* =0 keep the current directory the same as the browsing directory. The current browsing directory is contained in - b:netrw_curdir + b:netrw_curdir (also see |netrw-c|) *g:netrw_list_cmd* command for listing remote directories default: (if ssh is executable) @@ -919,15 +919,16 @@ DIRECTORY EXPLORING COMMANDS *netrw-nexplore* *netrw-vexplore* By default, these commands use the current file's directory. However, one may explicitly provide a directory (path) to use. -(Following needs v7.0 or later) *netrw-starstar* -When Explore, Sexplore, Hexplore, or Vexplore are used with a **, + *netrw-starstar* +When Explore, Sexplore, Hexplore, or Vexplore are used with a **/filepat, such as: > :Explore **/filename_pattern < -netrw will attempt to find a (sub)directory which matches the filename -pattern. Internally, it produces a list of files which match the pattern -and their paths; to that extent it resembles the Unix operation: +netrw will attempt to find a file in the current directory or any subdirectory +which matches the filename pattern. Internally, it produces a list of files +which match the pattern and their paths; to that extent it resembles the Unix +operation: > find $(pwd) -name "$1" -exec "echo" "{}" ";" 2> /dev/null < @@ -951,6 +952,18 @@ As an example, consider The status line will show, on the right hand side of the status line, a message like "Match 3 of 20". + *netrw-starpat* +When Explore, Sexplore, Hexplore, or Vexplore are used with a */pattern, +such as: +> + :Explore */pattern +< +netrw will use |:vimgrep| to find files which contain the given pattern. +Like what happens with |netrw-starstar|, a list of files which contain +matches to the given pattern is generated. The cursor will then jump +to the first file with the given pattern; |:Nexplore|, |:Pexplore|, and +the shifted-down and -up arrows work with the list to move to the next +or previous files in that list. REFRESHING THE LISTING *netrw-ctrl-l* @@ -1261,14 +1274,16 @@ to forward a copy to me for future inclusion in the distribution. MAKING THE BROWSING DIRECTORY THE CURRENT DIRECTORY *netrw-c* *netrw-curdir* -By default, g:netrw_keepdir is 1. This setting means that the current +By default, |g:netrw_keepdir| is 1. This setting means that the current directory will not track the browsing directory. However, setting -g:netrw_keepdir to 0 (say, in your <.vimrc>) will tell netrw to have the -currently browsed directory be the current directory. +g:netrw_keepdir to 0 (say, in your <.vimrc>) will tell netrw to make the +currently browsed directory also be the current directory. -With the default setting for g:netrw_keepdir, in order to make the two -directories the same, use the "c" map (just type c). That map will set the -current directory to the current browsing directory. +However, with the default setting for g:netrw_keepdir of 1 where netrw +maintains its own separate notion of the current directory, in order to make +the two directories the same, use the "c" map (just type c). That map will +set Vim's notion of the current directory to the netrw's current browsing +directory. BOOKMARKING A DIRECTORY *netrw-b* *netrw-bookmark* *netrw-bookmarks* @@ -1447,6 +1462,17 @@ which is loaded automatically at startup (assuming :set nocp). ============================================================================== 11. History *netrw-history* {{{1 + v91: * :Explore */pattern implemented + * |'acd'| option bypassed + v90: * mark ', as suggested by Yegappan Lakshmanan, used to help + guarantee entry into the jump list when appropriate. + * <s-down> and <s-up> are no longer defined until a + :Explore **/pattern is used (if the user already has a map + for them). They will be defined for new browser windows + from that point forward. + v89: * A <s-down>, <s-up>, :Nexplore, or a :Pexplore without having + first done an :Explore **/pattern (see |netrw-starstar|) caused + a lot of unhelpful error messages to appear v88: * moved DrChip.Netrw menu to Netrw. Now has priority 80 by default. g:NetrwTopLvlMenu == "Netrw" and can be changed by the user to suit. The priority is g:NetrwMenuPriority. diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 54412daf1..b10157d7e 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -1,4 +1,4 @@ -*print.txt* For Vim version 7.0e. Last change: 2005 Apr 01 +*print.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -287,7 +287,7 @@ another font will be used as follows: if b: is missing, then use r: if i: is missing, then use r: - if o: is missing, then use i: + if o: is missing, then use b: Some CJK fonts do not contain characters for codes in the ASCII code range. Also, some characters in the CJK ASCII code ranges differ in a few code points diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 8cefeafcb..78721196c 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.0e. Last change: 2006 Mar 23 +*quickref.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -707,6 +707,7 @@ Short explanation of each option: *option-list* 'guioptions' 'go' GUI: Which components and options are used 'guipty' GUI: try to use a pseudo-tty for ":!" commands 'guitablabel' 'gtl' GUI: custom label for a tab page +'guitabtooltip' 'gtt' GUI: custom tooltip for a tab page 'helpfile' 'hf' full path name of the main help file 'helpheight' 'hh' minimum height of a new help window 'helplang' 'hlg' preferred help languages diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt index fe7ab27f4..2f9090dcd 100644 --- a/runtime/doc/sponsor.txt +++ b/runtime/doc/sponsor.txt @@ -1,4 +1,4 @@ -*sponsor.txt* For Vim version 7.0e. Last change: 2006 Mar 29 +*sponsor.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -202,8 +202,8 @@ Are the donations tax deductible? That depends on your country. The donations to help the children in |Uganda| are tax deductible in Holland, Germany, Canada and in the USA. See the ICCF -website http://www.iccf.nl/donate.html. You must send an e-mail to Bram to -let him know that the donation is done because of the use of Vim. +website http://iccf-holland.org/donate.html. You must send an e-mail to Bram +to let him know that the donation is done because of the use of Vim. Can you send me a bill? diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index 566c802ad..f8d122350 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.0e. Last change: 2006 Apr 13 +*tabpage.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -82,6 +82,9 @@ In the GUI tab pages line you can use the right mouse button to open menu. CTRL-W gf Open a new tab page and edit the file name under the cursor. See |CTRL-W_gf|. +CTRL-W gF Open a new tab page and edit the file name under the cursor + and jump to the line number following the file name. + See |CTRL-W_gF|. CLOSING A TAB PAGE: @@ -306,21 +309,25 @@ specify the label to display for each tab page. Unlike 'tabline', which specifies the whole tab pages line at once, 'guitablabel' is used for each label separately. +'guitabtooltip' is very similar and is used for the tooltip of the same label. +This only appears when the mouse pointer hovers over the label, thus it +usually is longer. Only supported on some systems though. + See the 'statusline' option for the format of the value. The "%N" item can be used for the current tab page number. The |v:lnum| -variable is also set to this number when 'guitablabel' is evaluated. +variable is also set to this number when the option is evaluated. The items that use a file name refer to the current window of the tab page. -Note that syntax highlighting is not used for 'guitablabel'. The %T and %X +Note that syntax highlighting is not used for the option. The %T and %X items are also ignored. A simple example that puts the tab page number and the buffer name in the label: > :set guitablabel=%N\ %f -An example that resembles the default: Show the number of windows in the tab -page and a '+' if there is a modifed buffer: > +An example that resembles the default 'guitablabel': Show the number of +windows in the tab page and a '+' if there is a modifed buffer: > function GuiTabLabel() let label = '' diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 82fc5dd2d..08e85d8bd 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0e. Last change: 2006 Apr 20 +*todo.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,7 +30,7 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -For a tooltip of at GUI tab label we need a new field. Also 'guitabtip'? +Win32: Crash when adding many menu entries. (Karl Waedt) Crash in "z=" when the change triggers checking out the file, FileChangedRO event. Problem in move_lines()? FileChangedShell also involved? (Neil Bird) @@ -39,6 +39,7 @@ Added a few checks for valid buffer, did that help? Fix coverity false positives? Add more tests for all new functionality in Vim 7. Especially new functions. + :undojoin Win32: Describe how to do debugging. (George Reilly) diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index 432c85587..5e7b4ed8e 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -1,4 +1,4 @@ -*undo.txt* For Vim version 7.0e. Last change: 2006 Apr 12 +*undo.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -87,10 +87,11 @@ undone together. If you want to write a function or script that doesn't create a new undoable change but joins in with the previous change use this command: - *:undoj* *:undojoin* + *:undoj* *:undojoin* *E790* :undoj[oin] Join further changes with the previous undo block. Warning: Use with care, it may prevent the user from - properly undoing changes. + properly undoing changes. Don't use this after undo + or redo. {not in Vi} This is most useful when you need to prompt the user halfway a change. For diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 6c701e180..1aa93b6b7 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0e. Last change: 2006 Apr 20 +*version7.txt* For Vim version 7.0e. Last change: 2006 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -280,9 +280,9 @@ argument. The maximum number of pages can be set with 'tabpagemax'. The line with tab labels is either made with plain text an highlighting or with a GUI mechanism. The GUI labels look better but are only available on a -few systems. The line can be customized with 'tabline' and 'guitablabel'. -Whether it is displayed is set with 'showtabline'. Whether to use the GUI -labels is set with the "e" flag in 'guioptions'. +few systems. The line can be customized with 'tabline', 'guitablabel' and +'guitabtooltip'. Whether it is displayed is set with 'showtabline'. Whether +to use the GUI labels is set with the "e" flag in 'guioptions'. The |:tab| command modifier can be used to have most commands that open a new window open a new tab instead. @@ -895,6 +895,7 @@ BibTeX indent file. (Dorai Sitaram) BTM ftplugin file. (Bram Moolenaar) calendar ftplugin file. (Nikolai Weibull) Changelog indent file. (Nikolai Weibull) +ChordPro syntax file. (Niels Bo Andersen) Cmake indent and syntax file. (Andy Cedilnik) conf ftplugin file. (Nikolai Weibull) context syntax and ftplugin file. (Nikolai Weibull) @@ -2569,5 +2570,17 @@ It was possible to switch to another tab page when the cmdline window is open. Completion could hang when 'lines' is 6 and a preview window was opened. +Added CTRL-W gF: open file under cursor in new tab page and jump to the line +number following the file name. +Added 'guitabtooltip', but it's not implemented anywhere yet. + +Added "throw" to 'debug' option: thow an exception for error messages even +whey they would otherwise be ignored. + +When 'keymap' is set and a line contains an invalid entry could get a "No +mapping found" warning instead of a proper error message. + +Motif: default to using XpmAttributes instead of XpmAttributes_21. + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index f3e1c4545..2e5db8b51 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -729,6 +729,8 @@ CTRL-W F *CTRL-W_F* Split current window in two. Edit file name under cursor and jump to the line number following the file name. See |gF| for details on how the line number is obtained. + {not available when the |+file_in_path| feature was disabled + at compile time} CTRL-W gf *CTRL-W_gf* Open a new tab page and edit the file name under the cursor. @@ -737,6 +739,14 @@ CTRL-W gf *CTRL-W_gf* {not available when the |+file_in_path| feature was disabled at compile time} +CTRL-W gF *CTRL-W_gF* + Open a new tab page and edit the file name under the cursor + and jump to the line number following the file name. Like + "tab split" and "gF", but the new tab page isn't created if + the file does not exist. + {not available when the |+file_in_path| feature was disabled + at compile time} + Also see |CTRL-W_CTRL-I|: open window for an included file that includes the keyword under the cursor. |