From 52c5449659ff9e4979750d286ea27dc2848a2c54 Mon Sep 17 00:00:00 2001 From: Shon Feder Date: Fri, 1 Jan 2021 14:04:19 -0500 Subject: [PATCH 1/3] Update to document localleader instead of SPC m --- modules/lang/ocaml/README.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lang/ocaml/README.org b/modules/lang/ocaml/README.org index e9d1b07f2..bf0cc060a 100644 --- a/modules/lang/ocaml/README.org +++ b/modules/lang/ocaml/README.org @@ -76,8 +76,6 @@ tools. ** Commands | Command | Key | Description | |------------------------------+-----------+-----------------------------------------------------------| - | =merlin-type-enclosing= | =SPC m t= | display type under point | - | =tuareg-find-alternate-file= | =SPC m a= | switch between =.ml= and =.mli= | | =merlin-locate= | =gd= | lookup definition | | =merlin-occurences= | =SPC c D= | lookup references | | =merlin-document= | =K= | lookup documentation | @@ -85,6 +83,8 @@ tools. | =merlin-iedit-occurrences= | =v R= | visual refactor identifier under point (multiple cursors) | | =utop= | =SPC o r= | open =utop= as REPL | | =utop-eval-region= | =SPC c e= | evaluate selected region in =utop= | + | =merlin-type-enclosing= | = t= | display type under point | + | =tuareg-find-alternate-file= | = a= | switch between =.ml= and =.mli= | ** Hacks + =set-ligatures!= is called with the full tuareg prettify symbol list, this From 05e9e72d5babadb8b510da34309faad3f2b21863 Mon Sep 17 00:00:00 2001 From: Shon Feder Date: Fri, 1 Jan 2021 14:04:57 -0500 Subject: [PATCH 2/3] Add missing space between gd key sequence --- modules/lang/ocaml/README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/ocaml/README.org b/modules/lang/ocaml/README.org index bf0cc060a..acfd69d76 100644 --- a/modules/lang/ocaml/README.org +++ b/modules/lang/ocaml/README.org @@ -76,7 +76,6 @@ tools. ** Commands | Command | Key | Description | |------------------------------+-----------+-----------------------------------------------------------| - | =merlin-locate= | =gd= | lookup definition | | =merlin-occurences= | =SPC c D= | lookup references | | =merlin-document= | =K= | lookup documentation | | =merlin-imenu= | =SPC / i= | symbol lookup in file | @@ -85,6 +84,7 @@ tools. | =utop-eval-region= | =SPC c e= | evaluate selected region in =utop= | | =merlin-type-enclosing= | = t= | display type under point | | =tuareg-find-alternate-file= | = a= | switch between =.ml= and =.mli= | + | =merlin-locate= | =g d= | lookup definition | ** Hacks + =set-ligatures!= is called with the full tuareg prettify symbol list, this From 96f7dfd5ac5a8425d272816fce013f538efe5586 Mon Sep 17 00:00:00 2001 From: Shon Feder Date: Fri, 1 Jan 2021 14:22:21 -0500 Subject: [PATCH 3/3] Update symbol lookup binding --- modules/lang/ocaml/README.org | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/lang/ocaml/README.org b/modules/lang/ocaml/README.org index acfd69d76..fa4f55586 100644 --- a/modules/lang/ocaml/README.org +++ b/modules/lang/ocaml/README.org @@ -74,17 +74,17 @@ tools. * Appendix ** Commands - | Command | Key | Description | - |------------------------------+-----------+-----------------------------------------------------------| - | =merlin-occurences= | =SPC c D= | lookup references | - | =merlin-document= | =K= | lookup documentation | - | =merlin-imenu= | =SPC / i= | symbol lookup in file | - | =merlin-iedit-occurrences= | =v R= | visual refactor identifier under point (multiple cursors) | - | =utop= | =SPC o r= | open =utop= as REPL | - | =utop-eval-region= | =SPC c e= | evaluate selected region in =utop= | + | Command | Key | Description | + |------------------------------+-------------------+-----------------------------------------------------------| | =merlin-type-enclosing= | = t= | display type under point | | =tuareg-find-alternate-file= | = a= | switch between =.ml= and =.mli= | | =merlin-locate= | =g d= | lookup definition | + | =merlin-occurences= | =SPC c D= | lookup references | + | =merlin-document= | =K= | lookup documentation | + | =merlin-imenu= | =SPC s i= | symbol lookup in file | + | =merlin-iedit-occurrences= | =v R= | visual refactor identifier under point (multiple cursors) | + | =utop= | =SPC o r= | open =utop= as REPL | + | =utop-eval-region= | =SPC c e= | evaluate selected region in =utop= | ** Hacks + =set-ligatures!= is called with the full tuareg prettify symbol list, this