From: Benno Schulenberg Date: Mon, 9 Jun 2014 10:28:23 +0000 (+0000) Subject: Removing two superfluous conditions. X-Git-Tag: v2.3.5~114 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9ac910e9d33edd717df3e36f71b7b8f1a355310b;p=nano.git Removing two superfluous conditions. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4946 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 01a84eeb..2eaee2fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-06-09 Benno Schulenberg + * src/nano.c (do_input): Remove two superfluous false conditions. + 2014-06-09 Mark Majeres * src/text.c (do_undo, do_redo, add_undo, update_undo, do-wrap): Rewrite the line-wrapping code to make use of the existing line-break diff --git a/src/nano.c b/src/nano.c index e45dc30a..70e9049f 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1646,8 +1646,7 @@ int do_input(bool *meta_key, bool *func_key, bool allow_funcs) #ifndef DISABLE_WRAPPING /* If we got a shortcut or toggle, and it's not the shortcut * for verbatim input, turn off prepending of wrapped text. */ - if (have_shortcut && (!have_shortcut || s == NULL || s->scfunc != - do_verbatim_input)) + if (have_shortcut && s->scfunc != do_verbatim_input) wrap_reset(); #endif