CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-08-27 03:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '_glfwInputError_format' of https://github.com/Luflosi/kitty

Browse source
This commit is contained in:
Kovid Goyal 2019-08-26 06:24:02 +05:30
commit bfe595a8e8
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glfw/cocoa_window.m
View file

@ -692,8 +692,8 @@ static GLFWapplicationshouldhandlereopenfun handle_reopen_callback = NULL;
[window->context.nsgl.object update];
} @catch (NSException *e) {
_glfwInputError(GLFW_PLATFORM_ERROR,
"Failed to update NSGL Context object with error: %s (%s)",
[[e name] UTF8String], [[e reason] UTF8String]);
"Failed to update NSGL Context object with error: %s (%s)",
[[e name] UTF8String], [[e reason] UTF8String]);
}
}

2
glfw/wl_window.c vendored
View file

@ -1836,7 +1836,7 @@ static inline bool _glfwEnsureDataDevice(void) {
if (!_glfw.wl.dataDevice)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Cannot use clipboard, failed to create data device");
"Wayland: Cannot use clipboard, failed to create data device");
return false;
}
}