Patch for bug 2315 and 1525 - non convergent editline with preserve bloc...

A Christmas present for the editline community.