diff options
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/autocmd.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/motion.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 9 | ||||
| -rw-r--r-- | runtime/doc/spell.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/tagsrch.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/usr_03.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/usr_04.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/usr_05.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/usr_07.txt | 24 | ||||
| -rw-r--r-- | runtime/doc/usr_10.txt | 12 | ||||
| -rw-r--r-- | runtime/doc/usr_21.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/usr_23.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/usr_29.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/various.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/visual.txt | 5 |
18 files changed, 58 insertions, 54 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index bde99358de..85384519e6 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -869,9 +869,9 @@ TermResponse After the response to |t_RV| is received from the terminal. The value of |v:termresponse| can be used to do things depending on the terminal version. Note that this event may be - triggered halfway executing another event, - especially if file I/O, a shell command or - anything else that takes time is involved. + triggered halfway through another event + (especially if file I/O, a shell command, or + anything else that takes time is involved). *TextChanged* TextChanged After a change was made to the text in the current buffer in Normal mode. That is when diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index ea317f8424..faf22b718e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -5322,8 +5322,8 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip} to be found. Note that single-quote strings are used to avoid having to double the backslashes. The skip expression only catches comments at the start of a line, not after a command. - Also, a word "en" or "if" halfway a line is considered a - match. + Also, a word "en" or "if" halfway through a line is considered + a match. Another example, to search for the matching "{" of a "}": > :echo searchpair('{', '', '}', 'bW') diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index eaa2d8df35..7a5301b079 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -33,7 +33,8 @@ know what the hjkl keys do. The mnemonic value of hjkl is clear from looking at the keyboard. Think of j as an arrow pointing downwards. The 'virtualedit' option can be set to make it possible to move the cursor to -positions where there is no character or halfway a character. +positions where there is no character or within a multi-column character (like +a tab). ============================================================================== 1. Motions and operators *operator* diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index b707fb40f9..6c14d8e8fd 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1173,7 +1173,7 @@ A jump table for the options with a short description can be found at |Q_op|. Some applications use the BOM to recognize the encoding of the file. Often used for UCS-2 files on MS-Windows. For other applications it causes trouble, for example: "cat file1 file2" makes the BOM of file2 - appear halfway the resulting file. Gcc doesn't accept a BOM. + appear halfway through the resulting file. Gcc doesn't accept a BOM. When Vim reads a file and 'fileencodings' starts with "ucs-bom", a check for the presence of the BOM is done and 'bomb' set accordingly. Unless 'binary' is set, it is removed from the first line, so that you @@ -1998,9 +1998,10 @@ A jump table for the options with a short description can be found at |Q_op|. Also see the '<' flag below. *cpo-K* K Don't wait for a key code to complete when it is - halfway a mapping. This breaks mapping <F1><F1> when - only part of the second <F1> has been read. It - enables cancelling the mapping by typing <F1><Esc>. + halfway through a mapping. This breaks mapping + <F1><F1> when only part of the second <F1> has been + read. It enables cancelling the mapping by typing + <F1><Esc>. *cpo-l* l Backslash in a [] range in a search pattern is taken literally, only "\]", "\^", "\-" and "\\" are special. diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index eb8f130833..65533cab66 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1357,8 +1357,8 @@ Note: this doesn't work for postponed prefixes yet. *spell-COMPOUNDPERMITFLAG* The COMPOUNDPERMITFLAG specifies a flag that can be used on an affix. It means that the word plus affix can also be used in a compound word in a way -where the affix ends up halfway the word. Without this flag that is not -allowed. +where the affix ends up halfway through the word. Without this flag that is +not allowed. Note: this doesn't work for postponed prefixes yet. *spell-COMPOUNDROOT* diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index ee91a91acb..1841f83214 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -4075,8 +4075,8 @@ the match doesn't move to another line. The skip pattern can include the "\n", but the search for an end pattern will continue in the first character of the next line, also when that character is matched by the skip pattern. This is because redrawing may start in any line -halfway a region and there is no check if the skip pattern started in a -previous line. For example, if the skip pattern is "a\nb" and an end pattern +halfway in a region and there is no check if the skip pattern started in a +previous line. For example, if the skip pattern is "a\nb" and an end pattern is "b", the end pattern does match in the second line of this: > x x a b x x diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index 06c9838603..dc0ecae0a3 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -818,7 +818,7 @@ Common arguments for the commands above: When excluded, a match is ignored when the line is recognized as a comment (according to 'comments'), or the match is in a C comment (after "//" or inside /* */). Note that a match may be missed if a line is - recognized as a comment, but the comment ends halfway the line. + recognized as a comment, but the comment ends halfway through the line. And if the line is a comment, but it is not recognized (according to 'comments') a match may be found in it anyway. Example: > /* comment diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index d8907c8f98..b885b041d1 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1783,8 +1783,8 @@ Using UTF-8 character with ":command" does not work properly. (Matt Wozniski, In the Netbeans interface add a "vimeval" function, so that the other side can check the result of has("patch13"). -Cursor line at bottom of window instead of halfway after saving view and -restoring. Only with 'nowrap'. (Robert Webb, 2008 Aug 25) +Cursor line at bottom of window instead of halfway through after saving view +and restoring. Only with 'nowrap'. (Robert Webb, 2008 Aug 25) Netrw has trouble executing autocommands only for a directory. Add <isdir> and <notisdir> to autocommand patterns? Also <isfile>? @@ -2796,7 +2796,7 @@ Most interesting new features to be added when all bugs have been fixed: Especially when using the scrollbar. Typing a cursor-movement command scrolls back to where the cursor is. - Scroll commands by screen line. g CTRL-E and g CTRL-Y ? Requires the - first line to be able to start halfway. + first line to be able to start halfway through. - Running a shell command from the GUI still has limitations. Look into how the terminal emulator of the Vim shell project can help: http://vimshell.wana.at diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt index 6173260895..18a1f23e9f 100644 --- a/runtime/doc/usr_03.txt +++ b/runtime/doc/usr_03.txt @@ -200,7 +200,8 @@ more typing. last line of a file V Another way to move to a line is using the "%" command with a count. For -example "50%" moves you to halfway the file. "90%" goes to near the end. +example, "50%" moves you halfway through the file, and "90%" goes to near the +end. The previous assumes that you want to move to a line in the file, no matter if it's currently visible or not. What if you want to move to one of the lines diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt index 5f24c8c6f5..59ba0b3e73 100644 --- a/runtime/doc/usr_04.txt +++ b/runtime/doc/usr_04.txt @@ -201,7 +201,7 @@ change. Then you can use Visual mode. You start Visual mode by pressing "v". You move the cursor over the text you want to work on. While you do this, the text is highlighted. Finally type the operator command. - For example, to delete from halfway one word to halfway another word: + For example, to delete from the middle of a word to the middle of another: This is an examination sample of visual mode ~ ----------> diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index 9eee058a99..e16dee2fb9 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -133,7 +133,7 @@ the "2fw" command is executed and the displayed "2f" is removed. > set incsearch -Display the match for a search pattern when halfway typing it. +Display matches for a search pattern while you type. > map Q gq diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt index 8a0600b84d..50e4781cd7 100644 --- a/runtime/doc/usr_07.txt +++ b/runtime/doc/usr_07.txt @@ -215,14 +215,14 @@ change: > `. -Suppose you are editing the file "one.txt". Somewhere halfway the file you -use "x" to delete a character. Then you go to the last line with "G" and -write the file with ":w". You edit several other files, and then use ":edit -one.txt" to come back to "one.txt". If you now use `" Vim jumps to the last -line of the file. Using `. takes you to the position where you deleted the -character. Even when you move around in the file `" and `. will take you to -the remembered position. At least until you make another change or leave the -file. +Suppose you are editing the file "one.txt". Somewhere halfway through the +file you use "x" to delete a character. Then you go to the last line with "G" +and write the file with ":w". You edit several other files, and then use +":edit one.txt" to come back to "one.txt". If you now use `" Vim jumps to the +last line of the file. Using `. takes you to the position where you deleted +the character. Even when you move around in the file `" and `. will take you +to the remembered position, at least until you make another change or leave +the file. FILE MARKS @@ -233,8 +233,8 @@ another file and place marks there, these are specific for that file. Thus each file has its own set of marks, they are local to the file. So far we were using marks with a lowercase letter. There are also marks with an uppercase letter. These are global, they can be used from any file. -For example suppose that we are editing the file "foo.txt". Go to halfway the -file ("50%") and place the F mark there (F for foo): > +For example suppose that we are editing the file "foo.txt". Go to halfway of +the file ("50%") and place the F mark there (F for foo): > 50%mF @@ -242,8 +242,8 @@ Now edit the file "bar.txt" and place the B mark (B for bar) at its last line: > GmB -Now you can use the "'F" command to jump back to halfway foo.txt. Or edit yet -another file, type "'B" and you are at the end of bar.txt again. +Now you can use the "'F" command to jump back to halfway of foo.txt. Or edit +yet another file, type "'B" and you jump to the end of bar.txt. The file marks are remembered until they are placed somewhere else. Thus you can place the mark, do hours of editing and still be able to jump back to that diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt index c1f62f4494..64b0181c35 100644 --- a/runtime/doc/usr_10.txt +++ b/runtime/doc/usr_10.txt @@ -370,7 +370,7 @@ into "barfoo". was specified in this example. This is different from ":substitute", which works on one line without a range. The command isn't perfect, since it also matches lines where "//" appears -halfway a line, and the substitution will also take place before the "//". +halfway in a line, and the substitution will also take place before the "//". Just like with ":substitute", any pattern can be used. When you learn more complicated patterns later, you can use them here. @@ -625,7 +625,7 @@ When you are typing plain text, it's nice if the length of each line is automatically trimmed to fit in the window. To make this happen while inserting text, set the 'textwidth' option: > - :set textwidth=72 + :set textwidth=78 You might remember that in the example vimrc file this command was used for every text file. Thus if you are using that vimrc file, you were already @@ -633,10 +633,10 @@ using it. To check the current value of 'textwidth': > :set textwidth -Now lines will be broken to take only up to 72 characters. But when you -insert text halfway a line, or when you delete a few words, the lines will get -too long or too short. Vim doesn't automatically reformat the text. - To tell Vim to format the current paragraph: > +Now lines will be broken to take only up to 78 characters. However, when you +insert text halfway through a line or delete a few words, the line will get +too long or too short as Vim won't automatically reformat the text. To tell +Vim to format the current paragraph: gqap diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt index 450d394337..f7555df071 100644 --- a/runtime/doc/usr_21.txt +++ b/runtime/doc/usr_21.txt @@ -155,9 +155,9 @@ to be lost. Each item can be remembered only once. GETTING BACK TO WHERE YOU STOPPED VIM -You are halfway editing a file and it's time to leave for holidays. You exit -Vim and go enjoy yourselves, forgetting all about your work. After a couple -of weeks you start Vim, and type: +You are halfway through editing a file and it's time to leave for holidays. +You exit Vim and go enjoy yourselves, forgetting all about your work. After a +couple of weeks you start Vim, and type: > '0 diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt index 0578a63ae5..bdb3b7afd6 100644 --- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -61,10 +61,10 @@ The three names that Vim uses are: USING THE MAC FORMAT On Unix, <LF> is used to break a line. It's not unusual to have a <CR> -character halfway a line. Incidentally, this happens quite often in Vi (and -Vim) scripts. +character halfway in a line. Incidentally, this happens quite often in Vi +(and Vim) scripts. On the Macintosh, where <CR> is the line break character, it's possible to -have a <LF> character halfway a line. +have a <LF> character halfway in a line. The result is that it's not possible to be 100% sure whether a file containing both <CR> and <LF> characters is a Mac or a Unix file. Therefore, Vim assumes that on Unix you probably won't edit a Mac file, and doesn't check diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index be56d290dc..22de2f6ce6 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -223,8 +223,8 @@ example, suppose you want to select a tag that starts with "write_": > :tselect /^write_ The "^" specifies that the tag starts with "write_". Otherwise it would also -be found halfway a tag name. Similarly "$" at the end makes sure the pattern -matches until the end of a tag. +be found halfway in a tag name. Similarly "$" at the end makes sure the +pattern matches until the end of a tag. A TAGS BROWSER diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index c486568a5d..1df529cf73 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -19,9 +19,9 @@ CTRL-L Clear and redraw the screen. The redraw may happen *:redr* *:redraw* :redr[aw][!] Redraw the screen right now. When ! is included it is cleared first. - Useful to update the screen halfway executing a script - or function. Also when halfway a mapping and - 'lazyredraw' is set. + Useful to update the screen halfway through executing + a script or function (or a mapping if 'lazyredraw' + set). *:redraws* *:redrawstatus* :redraws[tatus][!] Redraw the status line of the current window. When ! @@ -79,8 +79,8 @@ g8 Print the hex values of the bytes used in the encoding because it contains illegal bytes. Does not wrap around the end of the file. Note that when the cursor is on an illegal byte or the - cursor is halfway a multi-byte character the command - won't move the cursor. + cursor is halfway through a multi-byte character the + command won't move the cursor. {not in Vi} {only when compiled with the |+multi_byte| feature} diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt index fe47e996aa..663c50445e 100644 --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -308,7 +308,7 @@ mode. {not available when compiled without the |+visualextra| feature} Reminder: Use 'virtualedit' to be able to select blocks that start or end -after the end of a line or halfway a tab. +after the end of a line or halfway through a tab. Visual-block Insert *v_b_I* With a blockwise selection, I{string}<ESC> will insert {string} at the start @@ -492,7 +492,8 @@ Otherwise, typed characters are handled as in Visual mode. When using an operator in Select mode, and the selection is linewise, the selected lines are operated upon, but like in characterwise selection. For -example, when a whole line is deleted, it can later be pasted halfway a line. +example, when a whole line is deleted, it can later be pasted in the middle of +a line. Mappings and menus in Select mode. *Select-mode-mapping* |