diff --git a/src/match.c b/src/match.c index 72276527d34f5..c9231876bccc1 100644 --- a/src/match.c +++ b/src/match.c @@ -446,14 +446,6 @@ next_search_hl( // or none is found in this line. for (;;) { -# ifdef FEAT_RELTIME - // Stop searching after passing the time limit. - if (timed_out) - { - shl->lnum = 0; // no match found in time - break; - } -# endif // Three situations: // 1. No useful previous match: search from start of line. // 2. Not Vi compatible or empty match: continue at next character. diff --git a/src/os_unix.c b/src/os_unix.c index b23adb710f69e..72f80c95dc093 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -8422,7 +8422,7 @@ start_timeout(long msec) if (ret == 0) { alarm_pending = sigismember(&sigs, SIGALRM); - ret = ret == 0 ? sigprocmask(SIG_SETMASK, &saved_sigs, NULL) : ret; + ret = sigprocmask(SIG_SETMASK, &saved_sigs, NULL); } if (unlikely(ret != 0 || alarm_pending < 0)) { diff --git a/src/version.c b/src/version.c index 074652ba4d5e9..542028606dde5 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 5062, /**/ 5061, /**/