From c471d9175782987903b39c96fb336188d2b0d1b9 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Sun, 12 May 2019 21:57:17 -0400 Subject: [PATCH] [ocaml] Sort key bindings --- layers/+lang/ocaml/README.org | 26 +++++++++++++------------- layers/+lang/ocaml/packages.el | 34 +++++++++++++++++----------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/layers/+lang/ocaml/README.org b/layers/+lang/ocaml/README.org index 3babbdf1b..ef0653a14 100644 --- a/layers/+lang/ocaml/README.org +++ b/layers/+lang/ocaml/README.org @@ -76,10 +76,10 @@ Make sure opam is initialized and configured. | ~SPC m g b~ | Go back to the last position where the user did a locate | | ~SPC m g g~ | Locate the identifier under point (same window) | | ~SPC m g G~ | Locate the identifier under point (different window) | -| ~SPC m g o~ | List occurrences for identifier under point | -| ~SPC m g l~ | Prompt for identifier and locate | | ~SPC m g i~ | Prompt for module name and switch to ML file | | ~SPC m g I~ | Prompt for module name and switch to MLI file | +| ~SPC m g l~ | Prompt for identifier and locate | +| ~SPC m g o~ | List occurrences for identifier under point | | ~SPC m h h~ | Document the identifier under point | | ~SPC m h t~ | Highlight identifier under cursor and print its type | | ~SPC m h T~ | Prompt for expression and show its type | @@ -91,6 +91,8 @@ Make sure opam is initialized and configured. | Key binding | Description | |-------------+------------------------------------------------------------------| +| ~C-j~ | (in REPL) next item in history | +| ~C-k~ | (in REPL) previous item in history | | ~SPC m s b~ | Send buffer to the REPL | | ~SPC m s B~ | Send buffer to the REPL and switch to the REPL in =insert state= | | ~SPC m s i~ | Start a REPL | @@ -98,27 +100,25 @@ Make sure opam is initialized and configured. | ~SPC m s P~ | Send phrase to the REPL and switch to the REPL in =insert state= | | ~SPC m s r~ | Send region to the REPL | | ~SPC m s R~ | Send region to the REPL and switch to the REPL in =insert state= | -| ~C-j~ | (in REPL) next item in history | -| ~C-k~ | (in REPL) previous item in history | ** Dune | Key binding | Description | |-------------+--------------------------------| | ~SPC m c c~ | Compile. | -| ~SPC m i l~ | Insert ~library~ stanza. | -| ~SPC m i e~ | Insert ~executable~ stanza. | -| ~SPC m i x~ | Insert ~executables~ stanza. | -| ~SPC m i r~ | Insert ~rule~ stanza. | -| ~SPC m i p~ | Insert ~ocamllex~ stanza. | -| ~SPC m i y~ | Insert ~ocamlyacc~ stanza. | -| ~SPC m i m~ | Insert ~menhir~ stanza. | | ~SPC m i a~ | Insert ~alias~ stanza. | -| ~SPC m i i~ | Insert ~install~ stanza. | | ~SPC m i c~ | Insert ~copyfiles~ stanza. | +| ~SPC m i d~ | Insert ignored subdirs stanza. | +| ~SPC m i e~ | Insert ~executable~ stanza. | +| ~SPC m i i~ | Insert ~install~ stanza. | +| ~SPC m i l~ | Insert ~library~ stanza. | +| ~SPC m i m~ | Insert ~menhir~ stanza. | +| ~SPC m i p~ | Insert ~ocamllex~ stanza. | +| ~SPC m i r~ | Insert ~rule~ stanza. | | ~SPC m i t~ | Insert ~tests~ stanza. | | ~SPC m i v~ | Insert ~env~ stanza. | -| ~SPC m i d~ | Insert ignored subdirs stanza. | +| ~SPC m i x~ | Insert ~executables~ stanza. | +| ~SPC m i y~ | Insert ~ocamlyacc~ stanza. | | ~SPC m t p~ | Dune run tests and promote. | | ~SPC m t P~ | Dune promote. | diff --git a/layers/+lang/ocaml/packages.el b/layers/+lang/ocaml/packages.el index 17f678bb8..26fa260d5 100644 --- a/layers/+lang/ocaml/packages.el +++ b/layers/+lang/ocaml/packages.el @@ -42,26 +42,26 @@ "tP" 'dune-promote "tp" 'dune-runtest-and-promote) (spacemacs/declare-prefix-for-mode 'tuareg-mode "mt" "test") - (spacemacs/set-leader-keys-for-major-mode 'dune-mode - "il" 'dune-insert-library-form - "ie" 'dune-insert-executable-form - "ix" 'dune-insert-executables-form - "ir" 'dune-insert-rule-form - "ip" 'dune-insert-ocamllex-form - "iy" 'dune-insert-ocamlyacc-form - "im" 'dune-insert-menhir-form - "ia" 'dune-insert-alias-form - "ii" 'dune-insert-install-form - "ic" 'dune-insert-copyfiles-form - "it" 'dune-insert-tests-form - "iv" 'dune-insert-env-form - "id" 'dune-insert-ignored-subdirs-form - "tP" 'dune-promote - "tp" 'dune-runtest-and-promote - "cc" 'compile) (spacemacs/declare-prefix-for-mode 'dune-mode "mc" "compile/check") (spacemacs/declare-prefix-for-mode 'dune-mode "mi" "insert-form") (spacemacs/declare-prefix-for-mode 'dune-mode "mt" "test") + (spacemacs/set-leader-keys-for-major-mode 'dune-mode + "cc" 'compile + "ia" 'dune-insert-alias-form + "ic" 'dune-insert-copyfiles-form + "id" 'dune-insert-ignored-subdirs-form + "ie" 'dune-insert-executable-form + "ii" 'dune-insert-install-form + "il" 'dune-insert-library-form + "im" 'dune-insert-menhir-form + "ip" 'dune-insert-ocamllex-form + "ir" 'dune-insert-rule-form + "it" 'dune-insert-tests-form + "iv" 'dune-insert-env-form + "ix" 'dune-insert-executables-form + "iy" 'dune-insert-ocamlyacc-form + "tP" 'dune-promote + "tp" 'dune-runtest-and-promote) (add-to-list 'auto-mode-alist '("\\(?:\\`\\|/\\)dune\\(?:\\.inc\\)?\\'" . dune-mode)))))