Resolve conflict on binding C-c C-c C-k

clarkenciel · Sep 10, 2016 · 97b163e · 97b163e
1 parent 74b68be
commit 97b163e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ You will now have the following key combinations at your disposal:
  <kbd>C-c C-c C-o</kbd> | cargo-process-current-file-tests
  <kbd>C-c C-c C-m</kbd> | cargo-process-fmt
  <kbd>C-c C-c C-k</kbd> | cargo-process-check
- <kbd>C-c C-c C-K</kbd> | cargo-process-clippy
+ <kbd>C-c C-c C-S-k</kbd> | cargo-process-clippy
 
 Before executing the task, Emacs will prompt you to save any modified buffers
 associated with the current Cargo project. Setting `compilation-ask-about-save`

diff --git a/cargo.el b/cargo.el
@@ -77,7 +77,7 @@
 (define-key cargo-minor-mode-map (kbd "C-c C-c C-o") 'cargo-process-current-file-tests)
 (define-key cargo-minor-mode-map (kbd "C-c C-c C-m") 'cargo-process-fmt)
 (define-key cargo-minor-mode-map (kbd "C-c C-c C-k") 'cargo-process-check)
-(define-key cargo-minor-mode-map (kbd "C-c C-c C-K") 'cargo-process-clippy)
+(define-key cargo-minor-mode-map (kbd "C-c C-c C-S-k") 'cargo-process-clippy)
 
 (provide 'cargo)
 ;;; cargo.el ends here