mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-21 10:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint, minor cleanup

Browse Source
This commit is contained in:
Justin M. Keyes
2018-02-07 01:13:51 +01:00
parent ed37136c5c
commit 35a7892781
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/normal.c
View File

@@ -5031,8 +5031,8 @@ static void nv_right(cmdarg_T *cap)
if ((!PAST_LINE && oneright() == false) if ((!PAST_LINE && oneright() == false)
|| (PAST_LINE && *get_cursor_pos_ptr() == NUL) || (PAST_LINE && *get_cursor_pos_ptr() == NUL)
) { ) {
// <Space> wraps to next line if 'whichwrap' has 's'. // <Space> wraps to next line if 'whichwrap' has 's'.
// 'l' wraps to next line if 'whichwrap' has 'l'. // 'l' wraps to next line if 'whichwrap' has 'l'.
// CURS_RIGHT wraps to next line if 'whichwrap' has '>'. // CURS_RIGHT wraps to next line if 'whichwrap' has '>'.
if (((cap->cmdchar == ' ' && vim_strchr(p_ww, 's') != NULL) if (((cap->cmdchar == ' ' && vim_strchr(p_ww, 's') != NULL)
|| (cap->cmdchar == 'l' && vim_strchr(p_ww, 'l') != NULL) || (cap->cmdchar == 'l' && vim_strchr(p_ww, 'l') != NULL)

8
src/nvim/os/shell.c
View File

@@ -576,14 +576,10 @@ static void read_input(DynamicBuffer *buf)
if (len == l) { if (len == l) {
// Finished a line, add a NL, unless this line should not have one. // Finished a line, add a NL, unless this line should not have one.
// FIXME need to make this more readable
if (lnum != curbuf->b_op_end.lnum if (lnum != curbuf->b_op_end.lnum
|| (!curbuf->b_p_bin || (!curbuf->b_p_bin && curbuf->b_p_fixeol)
&& curbuf->b_p_fixeol)
|| (lnum != curbuf->b_no_eol_lnum || (lnum != curbuf->b_no_eol_lnum
&& (lnum != && (lnum != curbuf->b_ml.ml_line_count || curbuf->b_p_eol))) {
curbuf->b_ml.ml_line_count
|| curbuf->b_p_eol))) {
dynamic_buffer_ensure(buf, buf->len + 1); dynamic_buffer_ensure(buf, buf->len + 1);
buf->data[buf->len++] = NL; buf->data[buf->len++] = NL;
} }

22
src/nvim/os/time.c
View File

@@ -38,33 +38,33 @@ uint64_t os_hrtime(void)
return uv_hrtime(); return uv_hrtime();
} }
/// Sleeps for a certain amount of milliseconds. /// Sleeps for `ms` milliseconds.
/// ///
/// @param milliseconds Number of milliseconds to sleep /// @param ms Number of milliseconds to sleep
/// @param ignoreinput If true, only SIGINT (CTRL-C) can interrupt. /// @param ignoreinput If true, only SIGINT (CTRL-C) can interrupt.
void os_delay(uint64_t milliseconds, bool ignoreinput) void os_delay(uint64_t ms, bool ignoreinput)
{ {
if (ignoreinput) { if (ignoreinput) {
if (milliseconds > INT_MAX) { if (ms > INT_MAX) {
milliseconds = INT_MAX; ms = INT_MAX;
} }
LOOP_PROCESS_EVENTS_UNTIL(&main_loop, NULL, (int)milliseconds, got_int); LOOP_PROCESS_EVENTS_UNTIL(&main_loop, NULL, (int)ms, got_int);
} else { } else {
os_microdelay(milliseconds * 1000u, ignoreinput); os_microdelay(ms * 1000u, ignoreinput);
} }
} }
/// Sleeps for a certain amount of microseconds. /// Sleeps for `us` microseconds.
/// ///
/// @param ms Number of microseconds to sleep. /// @param us Number of microseconds to sleep.
/// @param ignoreinput If true, ignore all input (including SIGINT/CTRL-C). /// @param ignoreinput If true, ignore all input (including SIGINT/CTRL-C).
/// If false, waiting is aborted on any input. /// If false, waiting is aborted on any input.
void os_microdelay(uint64_t ms, bool ignoreinput) void os_microdelay(uint64_t us, bool ignoreinput)
{ {
uint64_t elapsed = 0u; uint64_t elapsed = 0u;
uint64_t base = uv_hrtime(); uint64_t base = uv_hrtime();
// Convert microseconds to nanoseconds, or UINT64_MAX on overflow. // Convert microseconds to nanoseconds, or UINT64_MAX on overflow.
const uint64_t ns = (ms < UINT64_MAX / 1000u) ? ms * 1000u : UINT64_MAX; const uint64_t ns = (us < UINT64_MAX / 1000u) ? us * 1000u : UINT64_MAX;
uv_mutex_lock(&delay_mutex); uv_mutex_lock(&delay_mutex);