Move menu definitions inside keymap definitions

1 files changed, 46 insertions, 47 deletions

diff --git a/cider-mode.el b/cider-mode.el
index 93fad050..3add6d2a 100644
--- a/cider-mode.el
+++ b/cider-mode.el
@@ -70,6 +70,52 @@
     (define-key map (kbd "C-c M-d") 'cider-display-current-connection-info)
     (define-key map (kbd "C-c C-x") 'cider-refresh)
     (define-key map (kbd "C-c C-q") 'cider-quit)
+    (easy-menu-define cider-mode-menu map
+      "Menu for CIDER mode"
+      '("CIDER"
+        ["Complete symbol" complete-symbol]
+        "--"
+        ["Eval top-level sexp at point" cider-eval-defun-at-point]
+        ["Eval last sexp" cider-eval-last-sexp]
+        ["Eval last sexp in popup buffer" cider-pprint-eval-last-sexp]
+        ["Eval last sexp to REPL buffer" cider-eval-last-sexp-to-repl]
+        ["Eval last sexp and replace it with its result" cider-eval-last-sexp-and-replace]
+        ["Eval region" cider-eval-region]
+        ["Eval ns form" cider-eval-ns-form]
+        ["Insert last sexp in REPL" cider-insert-last-sexp-in-repl]
+        "--"
+        ["Load current buffer" cider-load-current-buffer]
+        ["Load file" cider-load-file]
+        "--"
+        ["Macroexpand-1 last expression" cider-macroexpand-1]
+        ["Macroexpand-all last expression" cider-macroexpand-all]
+        "--"
+        ["Jump to source" cider-jump]
+        ["Jump back" cider-jump-back]
+        "--"
+        ["Display documentation" cider-doc]
+        ["Display JavaDoc" cider-javadoc]
+        ["Inspect" cider-inspect]
+        "--"
+        ["Run test" cider-test-run-test]
+        ["Run all tests" cider-test-run-tests]
+        ["Rerun failed/erring tests" cider-test-rerun-tests]
+        ["Show test report" cider-test-show-report]
+        "--"
+        ["Set ns" cider-repl-set-ns]
+        ["Switch to REPL" cider-switch-to-repl-buffer]
+        ["Switch to Relevant REPL" cider-switch-to-relevant-repl-buffer]
+        ["Toggle REPL Pretty Print" cider-repl-toggle-pretty-printing]
+        ["Clear REPL" cider-find-and-clear-repl-buffer]
+        ["Refresh loaded code" cider-refresh]
+        ["Interrupt" cider-interrupt]
+        ["Quit" cider-quit]
+        ["Restart" cider-restart]
+        "--"
+        ["Display current nREPL connection" cider-display-current-connection-info]
+        ["Rotate current nREPL connection" cider-rotate-connection]
+        "--"
+        ["Version info" cider-version]))
     map))
 
 ;;;###autoload
@@ -84,53 +130,6 @@
   (add-to-list 'completion-at-point-functions
                'cider-complete-at-point))
 
-(easy-menu-define cider-mode-menu cider-mode-map
-  "Menu for CIDER mode"
-  '("CIDER"
-    ["Complete symbol" complete-symbol]
-    "--"
-    ["Eval top-level sexp at point" cider-eval-defun-at-point]
-    ["Eval last sexp" cider-eval-last-sexp]
-    ["Eval last sexp in popup buffer" cider-pprint-eval-last-sexp]
-    ["Eval last sexp to REPL buffer" cider-eval-last-sexp-to-repl]
-    ["Eval last sexp and replace it with its result" cider-eval-last-sexp-and-replace]
-    ["Eval region" cider-eval-region]
-    ["Eval ns form" cider-eval-ns-form]
-    ["Insert last sexp in REPL" cider-insert-last-sexp-in-repl]
-    "--"
-    ["Load current buffer" cider-load-current-buffer]
-    ["Load file" cider-load-file]
-    "--"
-    ["Macroexpand-1 last expression" cider-macroexpand-1]
-    ["Macroexpand-all last expression" cider-macroexpand-all]
-    "--"
-    ["Jump to source" cider-jump]
-    ["Jump back" cider-jump-back]
-    "--"
-    ["Display documentation" cider-doc]
-    ["Display JavaDoc" cider-javadoc]
-    ["Inspect" cider-inspect]
-    "--"
-    ["Run test" cider-test-run-test]
-    ["Run all tests" cider-test-run-tests]
-    ["Rerun failed/erring tests" cider-test-rerun-tests]
-    ["Show test report" cider-test-show-report]
-    "--"
-    ["Set ns" cider-repl-set-ns]
-    ["Switch to REPL" cider-switch-to-repl-buffer]
-    ["Switch to Relevant REPL" cider-switch-to-relevant-repl-buffer]
-    ["Toggle REPL Pretty Print" cider-repl-toggle-pretty-printing]
-    ["Clear REPL" cider-find-and-clear-repl-buffer]
-    ["Refresh loaded code" cider-refresh]
-    ["Interrupt" cider-interrupt]
-    ["Quit" cider-quit]
-    ["Restart" cider-restart]
-    "--"
-    ["Display current nREPL connection" cider-display-current-connection-info]
-    ["Rotate current nREPL connection" cider-rotate-connection]
-    "--"
-    ["Version info" cider-version]))
-
 (provide 'cider-mode)
 
 ;;; cider-mode.el ends here