mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
patch 9.0.1285: various small problems
Problem: Various small problems. Solution: Adjust white space and comments.
This commit is contained in:
@@ -538,7 +538,7 @@ transchar_byte(int c)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Convert non-printable character to two or more printable characters in
|
* 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.
|
* Does NOT work for multi-byte characters, c must be <= 255.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
|
@@ -273,8 +273,8 @@
|
|||||||
#if defined(FEAT_NORMAL) \
|
#if defined(FEAT_NORMAL) \
|
||||||
&& defined(FEAT_EVAL) \
|
&& defined(FEAT_EVAL) \
|
||||||
&& ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) \
|
&& ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) \
|
||||||
&& (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \
|
&& (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \
|
||||||
|| defined(MSWIN))
|
|| defined(MSWIN))
|
||||||
# define FEAT_RELTIME
|
# define FEAT_RELTIME
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -1662,7 +1662,7 @@ merge_modifyOtherKeys(int c_arg, int *modifiers)
|
|||||||
&& c >= 0 && c <= 127)
|
&& c >= 0 && c <= 127)
|
||||||
{
|
{
|
||||||
c += 0x80;
|
c += 0x80;
|
||||||
*modifiers &= ~(MOD_MASK_META|MOD_MASK_ALT);
|
*modifiers &= ~(MOD_MASK_META | MOD_MASK_ALT);
|
||||||
}
|
}
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
@@ -274,7 +274,7 @@ func Test_changing_cmdheight()
|
|||||||
call term_sendkeys(buf, ":set cmdheight-=2\<CR>")
|
call term_sendkeys(buf, ":set cmdheight-=2\<CR>")
|
||||||
call VerifyScreenDump(buf, 'Test_changing_cmdheight_4', {})
|
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, ":resize -1\<CR>")
|
||||||
call term_sendkeys(buf, ":set cmdheight=1\<CR>")
|
call term_sendkeys(buf, ":set cmdheight=1\<CR>")
|
||||||
call VerifyScreenDump(buf, 'Test_changing_cmdheight_5', {})
|
call VerifyScreenDump(buf, 'Test_changing_cmdheight_5', {})
|
||||||
@@ -491,7 +491,7 @@ func Test_getcompletion()
|
|||||||
call assert_equal([], l)
|
call assert_equal([], l)
|
||||||
|
|
||||||
if !has('ruby')
|
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')
|
let l = getcompletion('ruby', 'function')
|
||||||
call assert_equal([], l)
|
call assert_equal([], l)
|
||||||
endif
|
endif
|
||||||
|
@@ -51,6 +51,7 @@ func ScreenAttrs(lnum, width) abort
|
|||||||
return attrs
|
return attrs
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
" Create a new window with the requested size and fix it.
|
||||||
func NewWindow(height, width) abort
|
func NewWindow(height, width) abort
|
||||||
exe a:height . 'new'
|
exe a:height . 'new'
|
||||||
exe a:width . 'vsp'
|
exe a:width . 'vsp'
|
||||||
|
@@ -695,6 +695,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1285,
|
||||||
/**/
|
/**/
|
||||||
1284,
|
1284,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user