Merge branch 'trial-zsh-simplify-prompt' into adopt

like it.
Merge branch 'trial-vim-toggle-text-wrapping' into adopt

useful.
Fix merge failure @29b2e693ef5ecc022765d80dbd00fad40d5cb80a
Move a line.
Merge branch 'adopt' into trial

Merge the fix of merge failure...