Merge "Improve dumb terminal support (emacs is dumb)."
am: 46798ecd17

* commit '46798ecd1700c62472b9040e49a69207c5e33834':
  Improve dumb terminal support (emacs is dumb).