aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Ovchinnikov <revolver112@gmail.com>2015-03-14 22:12:23 +0100
committerJustin M. Keyes <justinkz@gmail.com>2015-03-16 11:01:07 -0400
commit9927e999486435ee0d0e4c82e9d263b774a1728e (patch)
tree019e362ea73792734a660a6c1fd5d7695d674842 /src
parent08d2f7b5629f036273a6e04193374fdc10be18d7 (diff)
downloadrneovim-9927e999486435ee0d0e4c82e9d263b774a1728e.tar.gz
rneovim-9927e999486435ee0d0e4c82e9d263b774a1728e.tar.bz2
rneovim-9927e999486435ee0d0e4c82e9d263b774a1728e.zip
Remove always-true expressions
Diffstat (limited to 'src')
-rw-r--r--src/nvim/regexp_nfa.c2
-rw-r--r--src/nvim/search.c2
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))