trailing whitespace not removed in corner case

when you're at the end of a line and press delete, the next line will be joined. however, this doesn't mark the current line as modified, so if the next line contained only whitespace, you now have a line with trailing whitespace that won't be stripped upon save even though the config option to do so is enabled.