[elpa] externals/ergoemacs-mode bef9844 207/325: Remove the Ergoemacs menu, change ? -> Help

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit bef984437a6376e16d3c5f2687c1c9b660a3120f
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>

    Remove the Ergoemacs menu, change ? -> Help
---
 ergoemacs-layouts.el      | 24 -----------------
 ergoemacs-map.el          |  4 ---
 ergoemacs-mode.el         |  4 ---
 ergoemacs-theme-engine.el | 67 -----------------------------------------------
 ergoemacs-themes.el       | 10 +++----
 5 files changed, 4 insertions(+), 105 deletions(-)

diff --git a/ergoemacs-layouts.el b/ergoemacs-layouts.el
index 2049b9b..8a5116b 100644
--- a/ergoemacs-layouts.el
+++ b/ergoemacs-layouts.el
@@ -405,30 +405,6 @@ If LAYOUT is unspecified, use `ergoemacs-keyboard-layout'."
                 `(const :tag ,elt :value ,elt))
               (sort (ergoemacs-layouts--list t) 'string<))))
 
-(defun ergoemacs-layouts--menu ()
-  "Gets the keymap entry for ergoemacs-layouts."
-  `(ergoemacs-keyboard-layout
-    menu-item "Keyboard Layouts"
-    (keymap
-     ,@(mapcar
-        (lambda(lay)
-          (let* ((variable (intern (concat "ergoemacs-layout-" lay)))
-                 (alias (condition-case nil
-                            (indirect-variable variable)
-                          (error variable)))
-                 (is-alias nil)
-                 (doc nil))
-            (setq doc (or (documentation-property variable 
'variable-documentation)
-                          (progn
-                            (setq is-alias t)
-                            (documentation-property alias 
'variable-documentation))))
-            `(,variable
-              menu-item ,(concat lay " - " doc)
-              (lambda() (interactive)
-                (ergoemacs-set-layout ,lay))
-              :button (:radio . (string= ergoemacs-keyboard-layout ,lay)))))
-        (sort (ergoemacs-layouts--list) 'string<)))))
-
 (defun ergoemacs-layouts--custom-documentation (&optional lays ini)
   "Get a documentation list of all known layouts.
 
diff --git a/ergoemacs-map.el b/ergoemacs-map.el
index 14adeb6..ed1e58d 100644
--- a/ergoemacs-map.el
+++ b/ergoemacs-map.el
@@ -49,7 +49,6 @@
 (defvar ergoemacs-map--cache-save)
 (defvar ergoemacs-map--hash)
 (defvar ergoemacs-map-properties--plist-hash)
-(defvar ergoemacs-menu-keymap)
 (defvar ergoemacs-mode)
 (defvar ergoemacs-modify-transient-maps)
 (defvar ergoemacs-saved-global-map)
@@ -77,7 +76,6 @@
 
 (declare-function ergoemacs-theme--get-version "ergoemacs-theme-engine")
 (declare-function ergoemacs-theme-components "ergoemacs-theme-engine")
-(declare-function ergoemacs-theme--menu "ergoemacs-theme-engine")
 
 (declare-function ergoemacs-map-keymap "ergoemacs-mapkeymap")
 
@@ -1059,8 +1057,6 @@ When INI is non-nil, add conditional maps to 
`minor-mode-map-alist'."
   "Install `ergoemacs-mode' into the appropriate keymaps."
   (interactive)
   (ergoemacs-mode-line)
-  (define-key ergoemacs-menu-keymap [menu-bar ergoemacs-mode]
-    `("ErgoEmacs" . ,(ergoemacs-theme--menu)))
   )
 
 (defvar ergoemacs-mode)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 46bd58c..9f84e74 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -129,9 +129,6 @@ Added beginning-of-buffer Alt+n (QWERTY notation) and 
end-of-buffer Alt+Shift+n"
 (defvar ergoemacs-saved-global-map nil
   "Saved global map.")
 
-(defvar ergoemacs-menu-keymap (make-sparse-keymap)
-  "ErgoEmacs minor-mode menu keymap.")
-
 (defvar ergoemacs-global-changed-keymap (make-sparse-keymap)
   "This keymap shows the global keys that were changed before `ergoemacs-mode' 
loaded.")
 
@@ -270,7 +267,6 @@ The `execute-extended-command' is now 
\\[execute-extended-command].
   :lighter " ErgoEmacs"
   :global t
   :group 'ergoemacs-mode
-  :keymap ergoemacs-menu-keymap
   (setq ergoemacs-mode--start-p t)
   (setq ergoemacs-map--hashkey nil)
 
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 0d06761..c858a17 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -69,7 +69,6 @@
 (declare-function ergoemacs-save "ergoemacs-lib")
 (declare-function ergoemacs-mode-reset "ergoemacs-mode")
 (declare-function ergoemacs-component-struct--component-description 
"ergoemacs-component")
-(declare-function ergoemacs-layouts--menu "ergoemacs-layouts")
 (declare-function ergoemacs-component-at-point "ergoemacs-component")
 (declare-function ergoemacs-component-find-1 "ergoemacs-component")
 (declare-function ergoemacs-component--prompt "ergoemacs-component")
@@ -224,72 +223,6 @@ When AT-END is non-nil, append a $ to the regular 
expression."
     (if (not theme-ver) nil
       (car (cdr theme-ver)))))
 
-(defun ergoemacs-theme--menu ()
-  "Define menus for current THEME."
-  `(keymap
-    ,(ergoemacs-layouts--menu)
-    (c-v
-     menu-item "Paste behavior"
-     (keymap
-      (c-v-multiple
-       menu-item "Repeating Paste pastes multiple times"
-       (lambda()
-         (interactive)
-         (ergoemacs-save 'ergoemacs-smart-paste nil))
-       :button (:radio . (eq ergoemacs-smart-paste 'nil)))
-      (c-v-cycle
-       menu-item "Repeating Paste cycles through previous pastes"
-       (lambda()
-         (interactive)
-         (ergoemacs-save 'ergoemacs-smart-paste t))
-       :button (:radio . (eq ergoemacs-smart-paste 't)))
-      (c-v-kill-ring
-       menu-item "Repeating Paste starts browse-kill-ring"
-       (lambda()
-         (interactive)
-         (ergoemacs-save 'ergoemacs-smart-paste 'browse-kill-ring))
-       :enable (condition-case err (interactive-form 'browse-kill-ring)
-                 (error nil))
-       :button (:radio . (eq ergoemacs-smart-paste 'browse-kill-ring)))))
-    (ergoemacs-sep-bash "--")
-    (ergoemacs-bash
-     menu-item "Make Bash aware of ergoemacs keys"
-     (lambda () (interactive)
-       (call-interactively 'ergoemacs-theme-create-bash)))
-    (ergoemacs-ahk
-     menu-item "Make Windows aware of ergoemacs keys (Requires Autohotkey)"
-     (lambda () (interactive)
-       (call-interactively 'ergoemacs-gen-ahk)))
-    (ergoemacs-sep-menu "--")
-    (ergoemacs-cheat
-     menu-item "Generate/Open Key binding Cheat Sheet"
-     ergoemacs-describe-current-theme)
-
-    (ergoemacs-save
-     menu-item "Save Settings for Future Sessions"
-     (lambda ()
-       (interactive)
-       (ergoemacs-exit-customize-save-customized)))
-
-    (ergoemacs-reset-cache
-     menu-item "Reset ergoemacs-mode cache"
-     (lambda ()
-       (interactive)
-       (ergoemacs-mode-clear-cache)))
-    
-    (ergoemacs-customize
-     menu-item "Customize ErgoEmacs"
-     (lambda ()
-       (interactive)
-       (customize-group 'ergoemacs-mode)))
-    (ergoemacs-mode-web-page
-     menu-item "Ergoemacs-mode web-page"
-     (lambda() (interactive)
-       (browse-url ergoemacs-mode-web-page-url)))
-    (ergoemacs-mode-exit
-     menu-item "Exit ergoemacs-mode"
-     (lambda() (interactive) (ergoemacs-mode -1)))))
-
 (defun ergoemacs-theme-at-point ()
   "Get the `ergoemacs-theme' defined at or before point.
 Return 0 if there is no such symbol.  Uses
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 037f2f6..f4bb13a 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -984,7 +984,7 @@ calling any other ergoemacs-set-* function"
 (defun ergoemacs-set-menu-bar-help ()
   "Help menu"
   (global-set-key [menu-bar help-menu]
-                  (cons (if (eq system-type 'darwin) "Help" "?")
+                  (cons "Help"
                         `(keymap
                           ;; Adapted from Menu-bar+
                           (whoops menu-item "Whoops!?"
@@ -1048,11 +1048,7 @@ calling any other ergoemacs-set-* function"
                                      (coding menu-item "Coding System..."
                                              describe-coding-system)
                                      (separator-ergoemacs-describe "--")
-                                     (theme-component menu-item "Ergoemacs 
Component"
-                                                      
describe-ergoemacs-component)
-                                     (theme menu-item "Ergoemacs Theme"
-                                            describe-ergoemacs-theme)
-                                     (layout menu-item "Ergoemacs Layout"
+                                     (layout menu-item "Keyboard Layout"
                                             describe-ergoemacs-layout)
                                      (separator-curr-modes menu-item "--")
                                      (curr-major-mode menu-item "Current Major 
Mode"
@@ -1067,6 +1063,8 @@ calling any other ergoemacs-set-* function"
                                      (curr-syntax menu-item "Current Syntax 
Table"
                                                   describe-syntax
                                                   :help "Describe the syntax 
specifications in the current syntax table")))
+                          (key-bindings menu-item "Key Bindings"
+                                        ergoemacs-describe-current-theme)
                           (learn-more menu-item "Learn More"
                                       (keymap
                                        (emacs menu-item"Emacs"