[Fix #683] Don't use C-c C-h keybindings

Author: Bozhidar Batsov

CHANGELOG.md

@@ -17,10 +17,10 @@ integration.
 * [#22](https://github.com/clojure-emacs/cider/issues/22): New command
 `cider-jump-to-resource` (bound to <kbd>C-c M-.</kbd>).
 * [#664](https://github.com/clojure-emacs/cider/pull/664): New apropos support:
-search function/var names (bound to <kbd>C-c C-h a</kbd>) or documentation
-(bound to <kbd>C-c C-h d</kbd>).
+search function/var names (bound to <kbd>C-c C-d a</kbd>) or documentation
+(bound to <kbd>C-c C-d A</kbd>).
 * You can open Grimoire's entry for a particular Clojure (built-in) symbol with
-  `cider-grimoire` (<kbd>C-c C-h g</kbd>).
+  `cider-grimoire` (<kbd>C-c C-d g</kbd>).
 
 ### Changes
 
@@ -43,7 +43,9 @@ paths over tramp by default.
 * [#610](https://github.com/clojure-emacs/cider/pull/610): Present error and
 stacktrace info for all exception causes.
 * Removed `cider-repl-print-length` config option and
-  `cider-repl-toggle-print-length-limiting` command.
+`cider-repl-toggle-print-length-limiting` command.
+* Remapped `cider-doc` to <kbd>C-c C-d d</kbd>.
+* Remapped `cider-javadoc` to <kbd>C-c C-d j</kbd>
 
 ### Bugs fixed
 

README.md

@@ -556,8 +556,8 @@ Keyboard shortcut                    | Description
 <kbd>C-c M-o</kbd>                   | Clear the entire REPL buffer, leaving only a prompt. Useful if you're running the REPL buffer in a side by side buffer.
 <kbd>C-c C-k</kbd>                   | Load the current buffer.
 <kbd>C-c C-l</kbd>                   | Load a file.
-<kbd>C-c C-d</kbd>                   | Display doc string for the symbol at point.  If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol.
-<kbd>C-c C-j</kbd>                   | Display JavaDoc (in your default browser) for the symbol at point.  If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol.
+<kbd>C-c C-d d</kbd>                   | Display doc string for the symbol at point.  If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol.
+<kbd>C-c C-d j</kbd>                   | Display JavaDoc (in your default browser) for the symbol at point.  If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol.
 <kbd>C-c M-i</kbd>                   | Inspect expression. Will act on expression at point if present.
 <kbd>C-c M-t</kbd>                   | Toggle var tracing.
 <kbd>C-c ,</kbd>                     | Run tests for namespace.
@@ -568,9 +568,9 @@ Keyboard shortcut                    | Description
 <kbd>C-c M-.</kbd>                   | Jump to the resource referenced by the string at point.
 <kbd>M-,</kbd>                       | Return to your pre-jump location.
 <kbd>M-TAB</kbd>                     | Complete the symbol at point.
-<kbd>C-c C-h g</kbd>                 | Lookup symbol in Grimoire.
-<kbd>C-c C-h a</kbd>                 | Apropos search for functions/vars.
-<kbd>C-c C-h d</kbd>                 | Apropos search for documentation.
+<kbd>C-c C-d g</kbd>                 | Lookup symbol in Grimoire.
+<kbd>C-c C-d a</kbd>                 | Apropos search for functions/vars.
+<kbd>C-c C-d A</kbd>                 | Apropos search for documentation.
 
 ### cider-repl-mode
 
@@ -588,8 +588,11 @@ Keyboard shortcut                    | Description
 <kbd>M-s</kbd> <kbd>M-r</kbd> | Search forward/reverse through command history with regex.
 <kbd>C-c C-n</kbd> <kbd>C-c C-p</kbd> | Move between the current and previous prompts in the REPL buffer. Pressing <kbd>RET</kbd> on a line with old input copies that line to the newest prompt.
 <kbd>TAB</kbd> | Complete symbol at point.
-<kbd>C-c C-d</kbd> | Display doc string for the symbol at point.  If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol
-<kbd>C-c C-j</kbd> | Display JavaDoc (in your default browser) for the symbol at point.  If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol.
+<kbd>C-c C-d d</kbd> | Display doc string for the symbol at point.  If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol
+<kbd>C-c C-d j</kbd> | Display JavaDoc (in your default browser) for the symbol at point.  If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol.
+<kbd>C-c C-d g</kbd> | Lookup symbol in Grimoire.
+<kbd>C-c C-d a</kbd> | Apropos search for functions/vars.
+<kbd>C-c C-d A</kbd> | Apropos search for documentation.
 <kbd>C-c C-z</kbd> | Switch to the previous Clojure buffer. This complements <kbd>C-c C-z</kbd> used in cider-mode.
 <kbd>C-c M-f</kbd> | Select a function from the current namespace and insert into the REPL buffer.
 <kbd>C-c M-i</kbd> | Inspect expression. Will act on expression at point if present.

cider-mode.el

@@ -38,9 +38,11 @@
     (define-key map (kbd "M-,") 'cider-jump-back)
     (define-key map (kbd "C-c M-.") 'cider-jump-to-resource)
     (define-key map (kbd "M-TAB") 'complete-symbol)
-    (define-key map (kbd "C-c C-h a") 'cider-apropos)
-    (define-key map (kbd "C-c C-h d") 'cider-apropos-documentation)
-    (define-key map (kbd "C-c C-h g") 'cider-grimoire)
+    (define-key map (kbd "C-c C-d a") 'cider-apropos)
+    (define-key map (kbd "C-c C-d A") 'cider-apropos-documentation)
+    (define-key map (kbd "C-c C-d g") 'cider-grimoire)
+    (define-key map (kbd "C-c C-d j") 'cider-javadoc)
+    (define-key map (kbd "C-c C-d d") 'cider-doc)
     (define-key map (kbd "C-M-x")   'cider-eval-defun-at-point)
     (define-key map (kbd "C-c C-c") 'cider-eval-defun-at-point)
     (define-key map (kbd "C-x C-e") 'cider-eval-last-sexp)
@@ -58,13 +60,11 @@
     (define-key map (kbd "C-c M-n") 'cider-repl-set-ns)
     (define-key map (kbd "C-c M-i") 'cider-inspect)
     (define-key map (kbd "C-c M-t") 'cider-toggle-trace)
-    (define-key map (kbd "C-c C-d") 'cider-doc)
     (define-key map (kbd "C-c C-z") 'cider-switch-to-repl-buffer)
     (define-key map (kbd "C-c M-o") 'cider-find-and-clear-repl-buffer)
     (define-key map (kbd "C-c C-k") 'cider-load-current-buffer)
     (define-key map (kbd "C-c C-l") 'cider-load-file)
     (define-key map (kbd "C-c C-b") 'cider-interrupt)
-    (define-key map (kbd "C-c C-j") 'cider-javadoc)
     (define-key map (kbd "C-c ,")   'cider-test-run-tests)
     (define-key map (kbd "C-c C-,") 'cider-test-rerun-tests)
     (define-key map (kbd "C-c M-,") 'cider-test-run-test)
@@ -103,6 +103,7 @@
         "--"
         ["Display documentation" cider-doc]
         ["Display JavaDoc" cider-javadoc]
+        ["Display Grimoire documentation" cider-grimoire]
         ["Inspect" cider-inspect]
         "--"
         ["Run test" cider-test-run-test]

cider-repl.el

@@ -988,7 +988,11 @@ ENDP) DELIM."
     (define-key map (kbd "TAB") 'cider-repl-tab)
     (define-key map (kbd "C-<return>") 'cider-repl-closing-return)
     (define-key map (kbd "C-j") 'cider-repl-newline-and-indent)
-    (define-key map (kbd "C-c C-d") 'cider-doc)
+    (define-key map (kbd "C-c C-d a") 'cider-apropos)
+    (define-key map (kbd "C-c C-d A") 'cider-apropos-documentation)
+    (define-key map (kbd "C-c C-d g") 'cider-grimoire)
+    (define-key map (kbd "C-c C-d d") 'cider-doc)
+    (define-key map (kbd "C-c C-d j") 'cider-javadoc)
     (define-key map (kbd "C-c C-o") 'cider-repl-clear-output)
     (define-key map (kbd "C-c M-o") 'cider-repl-clear-buffer)
     (define-key map (kbd "C-c M-n") 'cider-repl-set-ns)
@@ -1007,7 +1011,6 @@ ENDP) DELIM."
     (define-key map (kbd "C-c C-p") 'cider-repl-previous-prompt)
     (define-key map (kbd "C-c C-b") 'cider-interrupt)
     (define-key map (kbd "C-c C-c") 'cider-interrupt)
-    (define-key map (kbd "C-c C-j") 'cider-javadoc)
     (define-key map (kbd "C-c C-m") 'cider-macroexpand-1)
     (define-key map (kbd "C-c M-m") 'cider-macroexpand-all)
     (define-key map (kbd "C-c C-z") 'cider-switch-to-last-clojure-buffer)
@@ -1029,8 +1032,12 @@ ENDP) DELIM."
         ["Jump to resource" cider-jump-to-resource]
         ["Jump back" cider-jump-back]
         "--"
+        ["Search functions/vars" cider-apropos]
+        ["Search documentation" cider-apropos-documentation]
+        "--"
         ["Display documentation" cider-doc]
         ["Display JavaDoc" cider-javadoc]
+        ["Display Grimoire documentation" cider-grimoire]
         ["Inspect" cider-inspect]
         "--"
         ["Set REPL ns" cider-repl-set-ns]