* Remove all hunks which are included upstream now.
* Remove the hunk for the !BUFFERED_INPUT case, that code path/macro
has been dropped upstream completely.
* Some minor refresh for the "set_minus_o_option" hunk
* Add "int" to "extern igncr;" due to stricter compiler checks