diff --git a/ChangeLog b/ChangeLog index 01a84eeb9c234fcdcea7b7401f2a999e1b9c2241..2eaee2fa9210085181374e344f70dbd6cdb99506 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-06-09 Benno Schulenberg <bensberg@justemail.net> + * src/nano.c (do_input): Remove two superfluous false conditions. + 2014-06-09 Mark Majeres <mark@engine12.com> * 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 e45dc30ad8f87cb99bdcbfca6e49a77671b7b1af..70e9049f5ae79e4f41614c30d6362b475f9d47d0 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