GitLab

(menu-bar-emerge-menu): Remove unused variable.
(emerge-version): Make the variable an obsolete alias for the
emacs-version variable.  Make the function obsolete.
(emerge-fast-keymap, emerge-edit-keymap): Make a separate menu for
Emerge options, rather than merging in into the main Options menu.
(emerge-options-menu): Adjust menu text.  Use buttons for skip prefers
and auto advance modes.  Disable edit/fast items when not relevant.