diff options
author | Bram Moolenaar <Bram@vim.org> | 2008-06-24 20:19:36 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2008-06-24 20:19:36 +0000 |
commit | f233048a129fa7a3b89e064078435181d6421da5 (patch) | |
tree | 750527cb322fe9ba1559b81da60f2bee923c83cd /runtime/doc | |
parent | 176dd1e03c7e5f23e633705da2c8718d3cd320e1 (diff) |
updated for version 7.2a
Diffstat (limited to 'runtime/doc')
-rw-r--r-- | runtime/doc/index.txt | 26 | ||||
-rw-r--r-- | runtime/doc/message.txt | 4 | ||||
-rw-r--r-- | runtime/doc/os_mint.txt | 2 | ||||
-rw-r--r-- | runtime/doc/os_os2.txt | 2 | ||||
-rw-r--r-- | runtime/doc/tabpage.txt | 2 | ||||
-rw-r--r-- | runtime/doc/usr_22.txt | 184 | ||||
-rw-r--r-- | runtime/doc/usr_45.txt | 4 | ||||
-rw-r--r-- | runtime/doc/version4.txt | 2 | ||||
-rw-r--r-- | runtime/doc/vi_diff.txt | 9 |
9 files changed, 143 insertions, 92 deletions
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index f587cc902b..f494328df3 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.1. Last change: 2007 May 05 +*index.txt* For Vim version 7.2a. Last change: 2008 May 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -467,6 +467,7 @@ tag command action in Normal mode ~ |v_ab| ab "a block" from "[(" to "])" (with braces) |v_ap| ap "a paragraph" (with white space) |v_as| as "a sentence" (with white space) +|v_at| at "a tag block" (with white space) |v_aw| aw "a word" (with white space) |v_a{| a{ same as aB |v_a}| a} same as aB @@ -484,6 +485,7 @@ tag command action in Normal mode ~ |v_ib| ib "inner block" from "[(" to "])" |v_ip| ip "inner paragraph" |v_is| is "inner sentence" +|v_it| it "inner tag block" |v_iw| iw "inner word" |v_i{| i{ same as iB |v_i}| i} same as iB @@ -874,6 +876,10 @@ tag command note action in Visual mode ~ mode |v_X| X 2 delete the highlighted lines |v_Y| Y yank the highlighted lines +|v_aquote| a" extend highlighted area with a double + quoted string +|v_a'| a' extend highlighted area with a single + quoted string |v_a(| a( same as ab |v_a)| a) same as ab |v_a<| a< extend highlighted area with a <> block @@ -882,9 +888,12 @@ tag command note action in Visual mode ~ |v_aW| aW extend highlighted area with "a WORD" |v_a[| a[ extend highlighted area with a [] block |v_a]| a] same as a[ +|v_a`| a` extend highlighted area with a backtick + quoted string |v_ab| ab extend highlighted area with a () block |v_ap| ap extend highlighted area with a paragraph |v_as| as extend highlighted area with a sentence +|v_at| at extend highlighted area with a tag block |v_aw| aw extend highlighted area with "a word" |v_a{| a{ same as aB |v_a}| a} same as aB @@ -895,6 +904,10 @@ tag command note action in Visual mode ~ |v_gq| gq 2 format the highlighted lines |v_gv| gv exchange current and previous highlighted area +|v_iquote| i" extend highlighted area with a double + quoted string (without quotes) +|v_i'| i' extend highlighted area with a single + quoted string (without quotes) |v_i(| i( same as ib |v_i)| i) same as ib |v_i<| i< extend highlighted area with inner <> block @@ -903,9 +916,12 @@ tag command note action in Visual mode ~ |v_iW| iW extend highlighted area with "inner WORD" |v_i[| i[ extend highlighted area with inner [] block |v_i]| i] same as i[ +|v_i`| i` extend highlighted area with a backtick + quoted string (without the backticks) |v_ib| ib extend highlighted area with inner () block |v_ip| ip extend highlighted area with inner paragraph |v_is| is extend highlighted area with inner sentence +|v_it| it extend highlighted area with inner tag block |v_iw| iw extend highlighted area with "inner word" |v_i{| i{ same as iB |v_i}| i} same as iB @@ -1339,16 +1355,14 @@ The commands are sorted on the non-optional part of their name. |:print| :p[rint] print lines |:profdel| :profd[el] stop profiling a function or script |:profile| :prof[ile] profiling functions and scripts -|:promptfind| :pro[mtfind] open GUI dialog for searching -|:promptrepl| :promtr[epl] open GUI dialog for search/replace +|:promptfind| :pro[mptfind] open GUI dialog for searching +|:promptrepl| :promptr[epl] open GUI dialog for search/replace |:perldo| :perld[o] execute Perl command for each line |:pop| :po[p] jump to older entry in tag stack |:popup| :pop[up] popup a menu by name |:ppop| :pp[op] ":pop" in preview window |:preserve| :pre[serve] write all text to swap file |:previous| :prev[ious] go to previous file in argument list -|:promptfind| :pro[mptfind] Search dialog -|:promptrepl| :promptr[epl] Search/Replace dialog |:psearch| :ps[earch] like ":ijump" but shows match in preview window |:ptag| :pt[ag] show tag in preview window |:ptNext| :ptN[ext] |:tNext| in preview window @@ -1454,7 +1468,7 @@ The commands are sorted on the non-optional part of their name. |:startinsert| :star[tinsert] start Insert mode |:startgreplace| :startg[replace] start Virtual Replace mode |:startreplace| :startr[eplace] start Replace mode -|:stopinsert|| :stopi[nsert] stop Insert mode +|:stopinsert| :stopi[nsert] stop Insert mode |:stjump| :stj[ump] do ":tjump" and split window |:stselect| :sts[elect] do ":tselect" and split window |:sunhide| :sun[hide] same as ":unhide" diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 885d1eea6a..9f8bbfb906 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.1. Last change: 2007 Mar 20 +*message.txt* For Vim version 7.2a. Last change: 2007 Aug 19 VIM REFERENCE MANUAL by Bram Moolenaar @@ -53,7 +53,7 @@ If you are lazy, it also works without the shift key: > :help e72 ============================================================================== -2. Error messages *error-messages* +2. Error messages *error-messages* *errors* When an error message is displayed, but it is removed before you could read it, you can see it again with: > diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt index e2399f5798..bda358603e 100644 --- a/runtime/doc/os_mint.txt +++ b/runtime/doc/os_mint.txt @@ -1,4 +1,4 @@ -*os_mint.txt* For Vim version 7.1. Last change: 2005 Mar 29 +*os_mint.txt* For Vim version 7.2a. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Jens M. Felderhoff diff --git a/runtime/doc/os_os2.txt b/runtime/doc/os_os2.txt index c297bfc1b8..1374346c11 100644 --- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -1,4 +1,4 @@ -*os_os2.txt* For Vim version 7.1. Last change: 2007 Apr 22 +*os_os2.txt* For Vim version 7.2a. Last change: 2007 Apr 22 VIM REFERENCE MANUAL by Paul Slootman diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index 5826cf6cfe..6410b117b8 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.1. Last change: 2007 Mar 11 +*tabpage.txt* For Vim version 7.2a. Last change: 2007 Mar 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt index f872331eac..5a13b871e8 100644 --- a/runtime/doc/usr_22.txt +++ b/runtime/doc/usr_22.txt @@ -1,4 +1,4 @@ -*usr_22.txt* For Vim version 7.1. Last change: 2006 Apr 24 +*usr_22.txt* For Vim version 7.2a. Last change: 2007 Aug 14 VIM USER MANUAL - by Bram Moolenaar @@ -10,7 +10,7 @@ ways to browse the directory tree. There are commands to jump to a file that is mentioned in another. And Vim remembers which files have been edited before. -|22.1| The file explorer +|22.1| The file browser |22.2| The current directory |22.3| Finding a file |22.4| The buffer list @@ -20,7 +20,7 @@ before. Table of contents: |usr_toc.txt| ============================================================================== -*22.1* The file explorer +*22.1* The file browser Vim has a plugin that makes it possible to edit a directory. Try this: > @@ -29,85 +29,121 @@ Vim has a plugin that makes it possible to edit a directory. Try this: > Through the magic of autocommands and Vim scripts, the window will be filled with the contents of the directory. It looks like this: - " Press ? for keyboard shortcuts ~ - " Sorted by name (.bak,~,.o,.h,.info,.swp,.obj,.orig,.rej at end of list) ~ - "= /home/mool/vim/vim6/runtime/doc/ ~ - ../ ~ - check/ ~ - Makefile ~ - autocmd.txt ~ - change.txt ~ - eval.txt~ ~ - filetype.txt~ ~ - help.txt.info ~ +" ============================================================================ ~ +" Netrw Directory Listing (netrw v109) ~ +" Sorted by name ~ +" Sort sequence: [\/]$,\.h$,\.c$,\.cpp$,*,\.info$,\.swp$,\.o$\.obj$,\.bak$ ~ +" Quick Help: <F1>:help -:go up dir D:delete R:rename s:sort-by x:exec ~ +" ============================================================================ ~ +../ ~ +./ ~ +check/ ~ +Makefile ~ +autocmd.txt ~ +change.txt ~ +eval.txt~ ~ +filetype.txt~ ~ +help.txt.info ~ You can see these items: -1. A comment about using ? to get help for the functionality of the file - explorer. -2. The second line mentions how the items in the directory are listed. They - can be sorted in several ways. -3. The third line is the name of the current directory. -4. The "../" directory item. This is the parent directory. -5. The directory names. -6. The ordinary file names. As mentioned in the second line, some are not - here but "at the end of the list". -7. The less ordinary file names. You are expected to use these less often, - therefore they have been moved to the end. + +1. The name of the browsing tool and its version number +2. The name of the browsing directory +3. The method of sorting (may be by name, time, or size) +4. How names are to be sorted (directories first, then *.h files, + *.c files, etc) +5. How to get help (use the <F1> key), and an abbreviated listing + of available commands +6. A listing of files, including "../", which allows one to to list + the parent directory. If you have syntax highlighting enabled, the different parts are highlighted -to make it easier to spot them. +so as to make it easier to spot them. You can use Normal mode Vim commands to move around in the text. For example, -move to a file and press <Enter>. Now you are editing that file. To go back -to the explorer use ":edit ." again. CTRL-O also works. - Try using <Enter> while the cursor is on a directory name. The result is -that the explorer moves into that directory and displays the items found +move the cursor atop a file and press <Enter>; you will then be editing that +file. To go back to the browser use ":edit ." again, or use ":Explore". +CTRL-O also works. + +Try using <Enter> while the cursor is atop a directory name. The result is +that the file browser moves into that directory and displays the items found there. Pressing <Enter> on the first directory "../" moves you one level higher. Pressing "-" does the same thing, without the need to move to the "../" item first. -You can press ? to get short help on the things you can do in the explorer. -This is what you get: - - " <enter> : open file or directory ~ - " o : open new window for file/directory ~ - " O : open file in previously visited window ~ - " p : preview the file ~ - " i : toggle size/date listing ~ - " s : select sort field r : reverse sort ~ - " - : go up one level c : cd to this dir ~ - " R : rename file D : delete file ~ - " :help file-explorer for detailed help ~ - -The first few commands are for selecting a file to display. Depending on what -command you use, the file appears somewhere: - - <Enter> Uses the current window. - o Opens a new window. - O Uses the previously visited window. - p Uses the preview window, and moves the cursor back - into the explorer window. |preview-window| - -The following commands are used to display other information: - - i Display the size and date for the file. Using i again - will hide the information. - s Use the field the cursor is in to sort on. First - display the size and date with i. Then Move the - cursor to the size of any file and press s. The files - will now be sorted on size. Press s while the cursor - is on a date and the items will be sorted on date. - r reverse the sorting order (either size or date) - -There are a few extra commands: - - c Change the current directory to the displayed - directory. You can then type an ":edit" command for - one of the files without prepending the path. - R Rename the file under the cursor. You will be - prompted for the new name. - D Delete the file under the cursor. You will get a - prompt to confirm this. +You can press <F1> to get help on the things you can do in the netrw file +browser. This is what you get: > + + 9. Directory Browsing netrw-browse netrw-dir netrw-list netrw-help + + MAPS netrw-maps + <F1>.............Help.......................................|netrw-help| + <cr>.............Browsing...................................|netrw-cr| + <del>............Deleting Files or Directories..............|netrw-delete| + -................Going Up...................................|netrw--| + a................Hiding Files or Directories................|netrw-a| + mb...............Bookmarking a Directory....................|netrw-mb| + gb...............Changing to a Bookmarked Directory.........|netrw-gb| + c................Make Browsing Directory The Current Dir....|netrw-c| + d................Make A New Directory.......................|netrw-d| + D................Deleting Files or Directories..............|netrw-D| + <c-h>............Edit File/Directory Hiding List............|netrw-ctrl-h| + i................Change Listing Style.......................|netrw-i| + <c-l>............Refreshing the Listing.....................|netrw-ctrl-l| + o................Browsing with a Horizontal Split...........|netrw-o| + p................Use Preview Window.........................|netrw-p| + P................Edit in Previous Window....................|netrw-p| + q................Listing Bookmarks and History..............|netrw-q| + r................Reversing Sorting Order....................|netrw-r| +< (etc) + +The <F1> key thus brings you to a netrw directory browsing contents help page. +Its a regular help page; use the usual |CTRL-]| to jump to tagged help items +and |CTRL-O| to jump back. + +To select files for display and editing: (with the cursor is atop a filename) + + <enter> Open the file in the current window. |netrw-cr| + o Horizontally split window and display file |netrw-o| + v Vertically split window and display file |netrw-v| + p Use the |preview-window| |netrw-p| + P Edit in the previous window |netrw-P| + t Open file in a new tab |netrw-t| + +The following normal-mode commands may be used to control the browser display: + + i Controls listing style (thin, long, wide, and tree). + The long listing includes size and date information. + s Repeatedly pressing s will change the way the files + are sorted; one may sort on name, modification time, + or size. + r Reverse the sorting order. + +As a sampling of extra normal-mode commands: + + c Change Vim's notion of the current directory to be + the same as the browser directory. (see + |g:netrw_keepdir| to control this, too) + R Rename the file or directory under the cursor; a + prompt will be issued for the new name. + D Delete the file or directory under the cursor; a + confirmation request will be issued. + mb gb Make bookmark/goto bookmark + + +One may also use command mode; again, just a sampling: + + :Explore [directory] Browse specified/current directory + :NetrwSettings A comprehensive list of your current netrw + settings with help linkage. + +The netrw browser is not limited to just your local machine; one may use +urls such as: (that trailing / is important) + + :Explore ftp://somehost/path/to/dir/ + :e scp://somehost/path/to/dir/ + +See |netrw-browse| for more. ============================================================================== *22.2* The current directory @@ -255,8 +291,8 @@ solution for you: > The buffer "one.txt" disappears from the screen, but Vim still knows that you are editing this buffer, so it keeps the modified text. This is called a hidden buffer: The buffer contains text, but you can't see it. - The ":hide" command argument is another command. It makes that command -behave like the 'hidden' option was set. You could also set this option + The argument of ":hide" is another command. ":hide" makes that command +behave as if the 'hidden' option was set. You could also set this option yourself. The effect is that when any buffer is abandoned, it becomes hidden. Be careful! When you have hidden buffers with changes, don't exit Vim without making sure you have saved all the buffers. diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt index ab76ae81d3..5c83d1ce41 100644 --- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -1,4 +1,4 @@ -*usr_45.txt* For Vim version 7.1. Last change: 2006 Apr 24 +*usr_45.txt* For Vim version 7.2a. Last change: 2008 Apr 30 VIM USER MANUAL - by Bram Moolenaar @@ -195,7 +195,7 @@ though. Example: > If it doesn't work well, try getting a fontpack. If Microsoft didn't move it, you can find it here: - http://www.microsoft.com/typography/fontpack/default.htm ~ + http://www.microsoft.com/typography/fonts/default.aspx ~ Now you have told Vim to use Unicode internally and display text with a Unicode font. Typed characters still arrive in the encoding of your original diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt index bad5fece6c..8211a8d1ca 100644 --- a/runtime/doc/version4.txt +++ b/runtime/doc/version4.txt @@ -1,4 +1,4 @@ -*version4.txt* For Vim version 7.1. Last change: 2006 Apr 24 +*version4.txt* For Vim version 7.2a. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index 93ba2f5288..df1452d2c3 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -1,4 +1,4 @@ -*vi_diff.txt* For Vim version 7.1. Last change: 2007 Aug 14 +*vi_diff.txt* For Vim version 7.2a. Last change: 2008 May 05 VIM REFERENCE MANUAL by Bram Moolenaar @@ -192,7 +192,7 @@ Syntax highlighting. |:syntax| Spell checking. |spell| When the 'spell' option is set Vim will highlight spelling mistakes. About 40 languages are currently supported, selected with the - 'spellang' option. In source code only comments and strings are + 'spelllang' option. In source code only comments and strings are checked for spelling. Folding. |folding| @@ -427,8 +427,9 @@ Printing. |printing| Mouse support. |mouse-using| The mouse is supported in the GUI version, in an xterm for Unix, for - Linux with gpm, for MS-DOS, and Win32. It can be used to position the - cursor, select the visual area, paste a register, etc. + BSDs with sysmouse, for Linux with gpm, for MS-DOS, and Win32. It + can be used to position the cursor, select the visual area, paste a + register, etc. Usage of key names. |<>| |key-notation| Special keys now all have a name like <Up>, <End>, etc. |