Skip to content
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

Fix for keymapping bug on Linux and Windows #2189

Merged
merged 2 commits into from
Sep 11, 2017

Conversation

h93xV2
Copy link
Contributor

@h93xV2 h93xV2 commented Sep 7, 2017

In response to issue #2156, the keymapping conflict has been removed from linux.json and win32.json in the app/keymaps/ directory. Now the keymap for window close is ctrl+shift+q and the keymap for pane close is ctrl+shift+w.

Note: The first commit failed for the yarn command on CircleCI in this PR because I had neglected to update yarn.lock.

In response to issue vercel#2156, the keymapping conflict has been removed from linux.json and win32.json in the app/keymaps/ directory. Now the keymap for window close is ctrl+shift+q and the keymap for pane close is ctrl+shift+w.
@albinekb albinekb merged commit 3bca7c2 into vercel:master Sep 11, 2017
@albinekb albinekb mentioned this pull request Sep 11, 2017
@chabou
Copy link
Collaborator

chabou commented Sep 11, 2017

thank you so much @h93xV2

chabou added a commit that referenced this pull request Sep 11, 2017
* master:
  Fix yarn.lock (#2194)
  Fix for keymapping bug on Linux and Windows (#2189)
  Set session CWD only if there is an active session (#2191)
  Upgrade Electron to v1.7.6 (#2193)
  Fix plugin path in dev mode (#2192)
@h93xV2 h93xV2 deleted the issue-2156-fix branch September 12, 2017 03:13
spncrgr pushed a commit to spncrgr/hyper that referenced this pull request Sep 23, 2017
* Fix for keymapping bug on Linux and Windows

In response to issue vercel#2156, the keymapping conflict has been removed from linux.json and win32.json in the app/keymaps/ directory. Now the keymap for window close is ctrl+shift+q and the keymap for pane close is ctrl+shift+w.

* Fix for failed test on initial commit.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants