From 9927e999486435ee0d0e4c82e9d263b774a1728e Mon Sep 17 00:00:00 2001 From: Anton Ovchinnikov Date: Sat, 14 Mar 2015 22:12:23 +0100 Subject: [PATCH] Remove always-true expressions --- src/nvim/regexp_nfa.c | 2 +- src/nvim/search.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index fec7100703..6ed42303ef 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -5322,7 +5322,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm if (ireg_icombine && len == 0) { /* If \Z was present, then ignore composing characters. * When ignoring the base character this always matches. */ - if (len == 0 && sta->c != curc) + if (sta->c != curc) result = FAIL; else result = OK; diff --git a/src/nvim/search.c b/src/nvim/search.c index 26ff9a5bad..f62aeabd72 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -4252,7 +4252,7 @@ search_line: * looking for a define). A line starting with "# define" * is not considered to be a comment line. */ - if (!define_matched && skip_comments) { + if (skip_comments) { if ((*line != '#' || STRNCMP(skipwhite(line + 1), "define", 6) != 0) && get_leader_len(line, NULL, FALSE, TRUE))