Aimee,

That may be more desirable for me, too, actually. I haven’t tried this new setup for long enough to know whether it works well for me or not. To use Enter to get out of escape mode, you just remap it like so:

inoremap

In MacVim and gvim, shift-cr will enter a carriage return. This is how it is bound normally, and remapping by itself doesn’t change that. Inside a terminal window, vim can’t tell the difference between and shift-cr so it doesn’t work there.