From ddba89c9b6f0f6a7a8630add6f7a84a9be72577f Mon Sep 17 00:00:00 2001 From: watiko Date: Fri, 15 Jan 2016 17:22:14 +0900 Subject: [PATCH] vim-patch:7.4.1065 Problem: Cannot use the "dll" options on MS-Windows. Solution: Support the options on all platforms. Use the built-in name as the default, so that it's clear what Vim is looking for. https://github.com/vim/vim/commit/25e4fcde767084d1a79e0926bc301c92987c0cce --- runtime/doc/options.txt | 5 ++++- src/nvim/version.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) 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. diff --git a/src/nvim/version.c b/src/nvim/version.c index 0268364ac9..b113d3b6bf 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -79,6 +79,16 @@ static int included_patches[] = { + 1065, + // 1064, + // 1063, + // 1062, + // 1061, + // 1060, + // 1059, + // 1058, + // 1057, + // 1056, 1055, // 1054, // 1053,