New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolve conflicts between tmux layer and edit layer #945

Merged
merged 2 commits into from Oct 28, 2017

Conversation

Projects
None yet
2 participants
@ssfdust
Contributor

ssfdust commented Oct 27, 2017

#925
To resolve the conflicts, I subsitute the old key binding 'c-j' and 'c-k' with 'c-n' and 'c-u' which relate to multiple-cursors plugin.On the ohter hand, I replace the key binding 'c-l' with 'c-_'(means C-/) relating to consult the youdao online dictionary.
The default key binding metioned above for vim or neovim lists below:
C-n move down one line
C-u up half screen
C-_ unbound

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Oct 27, 2017

Codecov Report

Merging #945 into dev will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff           @@
##              dev     #945   +/-   ##
=======================================
  Coverage   34.49%   34.49%           
=======================================
  Files         209      209           
  Lines        8877     8877           
=======================================
  Hits         3062     3062           
  Misses       5815     5815

codecov bot commented Oct 27, 2017

Codecov Report

Merging #945 into dev will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff           @@
##              dev     #945   +/-   ##
=======================================
  Coverage   34.49%   34.49%           
=======================================
  Files         209      209           
  Lines        8877     8877           
=======================================
  Hits         3062     3062           
  Misses       5815     5815
@wsdjeg

This comment has been minimized.

Show comment
Hide comment
@wsdjeg

wsdjeg Oct 28, 2017

Member

I think use ctrl+u maybe is not good idea, maybe we can use ctrl+n and ctrl+m for multiple-cursors, as m and n are very close。 and both of them is just mean move down one line which can easy got via j <cr> or <down>.

Member

wsdjeg commented Oct 28, 2017

I think use ctrl+u maybe is not good idea, maybe we can use ctrl+n and ctrl+m for multiple-cursors, as m and n are very close。 and both of them is just mean move down one line which can easy got via j <cr> or <down>.

@ssfdust

This comment has been minimized.

Show comment
Hide comment
@ssfdust

ssfdust Oct 28, 2017

Contributor

Got it.

Contributor

ssfdust commented Oct 28, 2017

Got it.

@wsdjeg wsdjeg merged commit 230b344 into SpaceVim:dev Oct 28, 2017

5 checks passed

codecov/patch 100% of diff hit (target 34.49%)
Details
codecov/project 34.49% (+0%) compared to b9b2fa9
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment