diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-01 01:47:37 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-01 01:47:37 -0500 |
| commit | 1d995bb35706c67b87280244fce6ebdcd2e7acb5 (patch) | |
| tree | 48fb61734f6adf59ee0c38df1450358ad7ce47dd /runtime | |
| parent | 5ee87c68b792b4a704200b4e51ba948833b9cbfb (diff) | |
| parent | 228d236bdfd85721840e7ea7935fe0060a65fa93 (diff) | |
| download | rneovim-1d995bb35706c67b87280244fce6ebdcd2e7acb5.tar.gz rneovim-1d995bb35706c67b87280244fce6ebdcd2e7acb5.tar.bz2 rneovim-1d995bb35706c67b87280244fce6ebdcd2e7acb5.zip | |
Merge pull request #4013 from watiko/vim-increment
Vim patches related to increment and marks
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/change.txt | 13 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 42dc84e0de..30b7dcaa4a 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -370,11 +370,14 @@ CTRL-A Add [count] to the number or alphabetic character at CTRL-X Subtract [count] from the number or alphabetic character at or after the cursor. -The CTRL-A and CTRL-X commands work for (signed) decimal numbers, unsigned -binary/octal/hexadecimal numbers and alphabetic characters. This -depends on the 'nrformats' option. -- When 'nrformats' includes "bin", Vim considers numbers starting with '0b' or - '0B' as binary. +The CTRL-A and CTRL-X commands can work for: +- signed and unsigned decimal numbers +- unsigned binary, octal and hexadecimal numbers +- alphabetic characters + +This depends on the 'nrformats' option: +- When 'nrformats' includes "bin", Vim assumes numbers starting with '0b' or + '0B' are binary. - When 'nrformats' includes "octal", Vim considers numbers starting with a '0' to be octal, unless the number includes a '8' or '9'. Other numbers are decimal and may have a preceding minus sign. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index bbd9cc1e2b..d9024b98c0 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4396,7 +4396,7 @@ A jump table for the options with a short description can be found at |Q_op|. recognized as a multi click. *'nrformats'* *'nf'* -'nrformats' 'nf' string (default "hex") +'nrformats' 'nf' string (default "bin,hex") local to buffer This defines what bases Vim will consider for numbers when using the CTRL-A and CTRL-X commands for adding to and subtracting from a number @@ -4409,6 +4409,9 @@ A jump table for the options with a short description can be found at |Q_op|. hex If included, numbers starting with "0x" or "0X" will be considered to be hexadecimal. Example: Using CTRL-X on "0x100" results in "0x0ff". + bin If included, numbers starting with "0b" or "0B" will be + considered to be binary. Example: Using CTRL-X on + "0b1000" subtracts one, resulting in "0b0111". Numbers which simply begin with a digit in the range 1-9 are always considered decimal. This also happens for numbers that are not recognized as octal or hex. |