leave menu-bar decision to .userlocal.el
Merge branch 'master' of ssh://github.com/jianingy/emacs-ysl