Preserve failure messages when file locking fails

Original nano commit: 5059
http://svn.savannah.gnu.org/viewvc?view=rev&root=nano&revision=5059
Original nano commit message:
2014-07-11  Chris Allegretta <chrisa@asty.org>
        * src/files.c (do_lockfile, open_file): If locking fails,
        allow the lock failure message to be preserved AND
        preserve the filename passed on the cmdline.  Fixes
        Savannah bug #42668.
Use 'text add' instead of 'line wrap' for undid/redid message when undoing/redoing text additions that generated automatic line breaks

Original nano commit: 5064
http://svn.savannah.gnu.org/viewvc?view=rev&root=nano&revision=5064
Original nano commit message:
 	Not speaking of "line wrap" but of "text add" when undoing/redoing
	text additions that caused automatic line breaks.
	Patch by Mark Majeres.