All, Attached is a small patch for console mode. It fixes two things. One, it fixes the cursor shape, as the termcap entries are reversed in the source (this has bugged me litterally for years, Im sorry I never submitted a patch sooner). The second part of the patch is to disable auto-margins if the terminal can, and uses them. This solves another problem I've had for a long time, where the screen could become corrupted under certain circumstances if the minibuffer display was too long. The patch is against 21.5.21, but the same could (and should) be done for 21.4 if there's to be another release of that.