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

mlterm: fix mouse keybinding with numlock #19613

Merged
merged 1 commit into from
Oct 22, 2016
Merged

mlterm: fix mouse keybinding with numlock #19613

merged 1 commit into from
Oct 22, 2016

Conversation

RamKromberg
Copy link
Contributor

Motivation for this change

a patch for a very annoying bug upstream fixed ( https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3 ) but has yet point release.

tested in stable pulling from both master or stable rebase.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@RamKromberg, thanks for your PR! By analyzing the history of the files in this pull request, we identified @vrthra and @phanimahesh to be potential reviewers.

@vrthra
Copy link
Member

vrthra commented Oct 17, 2016

@RamKromberg could you fetch the patch from upstream rather than add to the repo?

@RamKromberg
Copy link
Contributor Author

@vrthra upstream moved around some filenames and functions (xwindow/x_shortcut.c -> uitoolkit/ui_shortcut.c) a few commits earlier so I'm afraid it's not a viable option.

@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
harfbuzz fribidi m17n_lib openssl libssh2
];

patches = [ ./x_shortcut.c.patch ]; #fixes numlock in 3.7.2. https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the patch can't be used directly from upstream, maybe add a note here that it has to be removed for next point release?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems redundant but I guess it can't hurt.

@grahamc grahamc merged commit ef12f4e into NixOS:master Oct 22, 2016
@RamKromberg RamKromberg deleted the fix/mlterm branch October 23, 2016 08:28
@RamKromberg
Copy link
Contributor Author

Thanks!

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

5 participants