diff options
| author | Bram Moolenaar <Bram@vim.org> | 2023-02-05 18:00:42 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-02-05 18:00:42 +0000 |
| commit | a9a6b0323ea3dc5e4d11d28e7c9ae3534e02ee54 (patch) | |
| tree | f22f9b6ea343ff0151b39b11da757ecd2c91fafc | |
| parent | 40b4872966d3886e7ff86184ae4ffb58704bf075 (diff) | |
patch 9.0.1285: various small problemsv9.0.1285
Problem: Various small problems.
Solution: Adjust white space and comments.
| -rw-r--r-- | src/charset.c | 2 | ||||
| -rw-r--r-- | src/feature.h | 4 | ||||
| -rw-r--r-- | src/getchar.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_cmdline.vim | 4 | ||||
| -rw-r--r-- | src/testdir/view_util.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/src/charset.c b/src/charset.c index 0bad471e45..9609299717 100644 --- a/src/charset.c +++ b/src/charset.c @@ -538,7 +538,7 @@ transchar_byte(int c) /* * Convert non-printable character to two or more printable characters in - * "buf[]". "charbuf" needs to be able to hold five bytes. + * "charbuf[]". "charbuf" needs to be able to hold five bytes. * Does NOT work for multi-byte characters, c must be <= 255. */ void diff --git a/src/feature.h b/src/feature.h index 3255f8abd3..ad61cb9229 100644 --- a/src/feature.h +++ b/src/feature.h @@ -273,8 +273,8 @@ #if defined(FEAT_NORMAL) \ && defined(FEAT_EVAL) \ && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) \ - && (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \ - || defined(MSWIN)) + && (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \ + || defined(MSWIN)) # define FEAT_RELTIME #endif diff --git a/src/getchar.c b/src/getchar.c index 2d30d4fb16..2f0079d5cf 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -1662,7 +1662,7 @@ merge_modifyOtherKeys(int c_arg, int *modifiers) && c >= 0 && c <= 127) { c += 0x80; - *modifiers &= ~(MOD_MASK_META|MOD_MASK_ALT); + *modifiers &= ~(MOD_MASK_META | MOD_MASK_ALT); } return c; } diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 23d6b4c92c..e1c336a950 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -274,7 +274,7 @@ func Test_changing_cmdheight() call term_sendkeys(buf, ":set cmdheight-=2\<CR>") call VerifyScreenDump(buf, 'Test_changing_cmdheight_4', {}) - " reducing window size and then setting cmdheight + " reducing window size and then setting cmdheight call term_sendkeys(buf, ":resize -1\<CR>") call term_sendkeys(buf, ":set cmdheight=1\<CR>") call VerifyScreenDump(buf, 'Test_changing_cmdheight_5', {}) @@ -491,7 +491,7 @@ func Test_getcompletion() call assert_equal([], l) if !has('ruby') - " global_functions[] has an entry but it doesn't have an implemention + " global_functions[] has an entry but it doesn't have an implementation let l = getcompletion('ruby', 'function') call assert_equal([], l) endif diff --git a/src/testdir/view_util.vim b/src/testdir/view_util.vim index d9e740da3f..71cb071ab7 100644 --- a/src/testdir/view_util.vim +++ b/src/testdir/view_util.vim @@ -51,6 +51,7 @@ func ScreenAttrs(lnum, width) abort return attrs endfunc +" Create a new window with the requested size and fix it. func NewWindow(height, width) abort exe a:height . 'new' exe a:width . 'vsp' diff --git a/src/version.c b/src/version.c index 97767d292f..7c85a97e61 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1285, +/**/ 1284, /**/ 1283, |