diff options
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/editing.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 7 | ||||
| -rw-r--r-- | runtime/doc/helphelp.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/intro.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/tagsrch.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/usr_23.txt | 16 | ||||
| -rw-r--r-- | runtime/doc/usr_41.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/windows.txt | 10 |
10 files changed, 31 insertions, 26 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 15a9fcdde4..eddd341ace 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -995,7 +995,7 @@ original file fails, there will be an error message telling you that you lost the original file. *DOS-format-write* -If the 'fileformat' is "dos", <CR> <NL> is used for <EOL>. This is default +If the 'fileformat' is "dos", <CR><NL> is used for <EOL>. This is default for Windows. On other systems the message "[dos format]" is shown to remind you that an unusual <EOL> was used. *Unix-format-write* @@ -1350,8 +1350,8 @@ There are a few things to remember when editing binary files: It is also possible that you get an "out of memory" error when reading the file. - Make sure the 'binary' option is set BEFORE loading the - file. Otherwise both <CR> <NL> and <NL> are considered to end a line - and when the file is written the <NL> will be replaced with <CR> <NL>. + file. Otherwise both <CR><NL> and <NL> are considered to end a line + and when the file is written the <NL> will be replaced with <CR><NL>. - <Nul> characters are shown on the screen as ^@. You can enter them with "CTRL-V CTRL-@" or "CTRL-V 000". - To insert a <NL> character in the file split a line. When writing the diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 38a5e9c2dc..b0bad1ffe1 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -3996,7 +3996,8 @@ fnamemodify({fname}, {mods}) *fnamemodify()* :echo fnamemodify("main.c", ":p:h") < results in: > /home/mool/vim/vim/src -< Note: Environment variables don't work in {fname}, use +< If {mods} is empty then {fname} is returned. + Note: Environment variables don't work in {fname}, use |expand()| first then. foldclosed({lnum}) *foldclosed()* @@ -4314,7 +4315,9 @@ getchar([expr]) *getchar()* endif < There is no prompt, you will somehow have to make clear to the - user that a character has to be typed. + user that a character has to be typed. The screen is not + redrawn, e.g. when resizing the window. + There is no mapping for the character. Key codes are replaced, thus when the user presses the <Del> key you get the code for the <Del> key, not the raw character diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index aafeb91906..2f00d19b71 100644 --- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -92,9 +92,9 @@ Help on help files *helphelp* :help k| only < Note that a space before the '|' is seen as part of the ":help" argument. - You can also use <LF> or <CR> to separate the help + You can also use <NL> or <CR> to separate the help command from a following command. You need to type - CTRL-V first to insert the <LF> or <CR>. Example: > + CTRL-V first to insert the <NL> or <CR>. Example: > :help so<C-V><CR>only < diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 3a6222e10d..925b3e5dbb 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -324,7 +324,7 @@ notation meaning equivalent decimal value(s) ~ <CSI> command sequence intro ALT-Esc 155 *<CSI>* <xCSI> CSI when typed in the GUI *<xCSI>* -<EOL> end-of-line (can be <CR>, <LF> or <CR><LF>, +<EOL> end-of-line (can be <CR>, <NL> or <CR><NL>, depends on system and 'fileformat') *<EOL>* <Ignore> cancel wait-for-character *<Ignore>* <NOP> no-op: do nothing (useful in mappings) *<Nop>* diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 52065ea3b5..1d96ee8e97 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2292,7 +2292,7 @@ A jump table for the options with a short description can be found at |Q_op|. local to buffer This gives the <EOL> of the current buffer, which is used for reading/writing the buffer from/to a file: - dos <CR> <NL> + dos <CR><NL> unix <NL> mac <CR> When "dos" is used, CTRL-Z at the end of a file is ignored. @@ -3778,6 +3778,8 @@ A jump table for the options with a short description can be found at |Q_op|. Only switch it off when working with old Vi scripts. In any other situation write patterns that work when 'magic' is on. Include "\M" when you want to |/\M|. + In |Vim9| script the value of 'magic' is ignored, patterns behave like + it is always set. *'makeef'* *'mef'* 'makeef' 'mef' string (default: "") diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 59a1d1a185..e6404ec4f5 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -43,8 +43,8 @@ This command also sources the |menu.vim| script when the GUI is running or will start soon. See |'go-M'| about avoiding that. *:syn-on* *:syntax-on* -The `:syntax enable` command will keep your current color settings. This -allows using `:highlight` commands to set your preferred colors before or +The `:syntax enable` command will keep most of your current color settings. +This allows using `:highlight` commands to set your preferred colors before or after using this command. If you want Vim to overrule your settings with the defaults, use: > :syntax on diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index c5a34c2dbf..2c1b927e5a 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -539,7 +539,7 @@ The first format is a normal tag, which is completely compatible with Vi. It is the only format produced by traditional ctags implementations. This is often used for functions that are global, also referenced in other files. -The lines in the tags file can end in <LF> or <CR><LF>. On the Macintosh <CR> +The lines in the tags file can end in <NL> or <CR><NL>. On the Macintosh <CR> also works. The <CR> and <NL> characters can never appear inside a line. The second format is new. It includes additional information in optional diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt index 76cc27a972..2f88793db2 100644 --- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -26,9 +26,9 @@ start a new line. One to move the carriage back to the first position (carriage return, <CR>), another to move the paper up (line feed, <LF>). When computers came out, storage was expensive. Some people decided that they did not need two characters for end-of-line. The Unix people decided -they could use <Line Feed> only for end-of-line. The Apple people -standardized on <CR>. The Microsoft Windows folks decided to keep -the old <CR><LF>. +they could use <New Line> or <NL> only for end-of-line. The Apple people +standardized on <CR>. The Microsoft Windows folks decided to keep the old +<CR><NL> (we use <NL> for line feed in the help text). This means that if you try to move a file from one system to another, you have line-break problems. The Vim editor automatically recognizes the different file formats and handles things properly behind your back. @@ -53,20 +53,20 @@ which format you have, execute the following command: > The three names that Vim uses are: - unix <LF> - dos <CR><LF> + unix <NL> + dos <CR><NL> mac <CR> USING THE MAC FORMAT -On Unix, <LF> is used to break a line. It's not unusual to have a <CR> +On Unix, <NL> is used to break a line. It's not unusual to have a <CR> 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 in a line. +have a <NL> 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, +containing both <CR> and <NL> 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 for this type of file. To check for this format anyway, add "mac" to 'fileformats': > diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index 9505ac7909..30f0cdfb62 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1609,7 +1609,7 @@ Here is a summary of items that apply to Vim scripts. They are also mentioned elsewhere, but form a nice checklist. The end-of-line character depends on the system. For Unix a single <NL> -character is used. For Windows <CR><LF> is used. This is important when +character is used. For Windows <CR><NL> is used. This is important when using mappings that end in a <CR>. See |:source_crnl|. diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index efbcd2448d..f6460e40dc 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -183,11 +183,6 @@ CTRL-W CTRL_N *CTRL-W_CTRL-N* This behaves like a ":split" first, and then an ":enew" command. -:[N]vne[w] [++opt] [+cmd] [file] *:vne* *:vnew* - Like |:new|, but split vertically. If 'equalalways' is set - and 'eadirection' isn't "ver" the windows will be spread out - horizontally, unless a width was specified. - :[N]new [++opt] [+cmd] {file} :[N]sp[lit] [++opt] [+cmd] {file} *:split_f* Create a new window and start editing file {file} in it. This @@ -199,6 +194,11 @@ CTRL-W CTRL_N *CTRL-W_CTRL-N* height). Reduces the current window height to create room (and others, if the 'equalalways' option is set). +:[N]vne[w] [++opt] [+cmd] [file] *:vne* *:vnew* + Like |:new|, but split vertically. If 'equalalways' is set + and 'eadirection' isn't "ver" the windows will be spread out + horizontally, unless a width was specified. + :[N]sv[iew] [++opt] [+cmd] [file] *:sv* *:sview* *splitview* Same as ":split", but set 'readonly' option for this buffer. |