Merge branch 'remove-trailing-whitespace' of https://github.com/Luflosi/kitty

This commit is contained in:
Kovid Goyal 2020-07-09 07:42:02 +05:30
commit f7ff63132d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
5 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,5 @@
pkg-config
python
imagemagick
harfbuzz
python
imagemagick
harfbuzz
sphinx-doc

View File

@ -1,7 +1,7 @@
### Reporting bugs
Please first search existing bug reports (especially closed ones) for a report
that matches your issue.
that matches your issue.
When reporting a bug, provide full details of your environment, that means, at
a minimum, kitty version, OS and OS version, kitty config (ideally a minimal

View File

@ -241,7 +241,7 @@
"hash": "sha256:4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d",
"urls": ["https://wayland.freedesktop.org/releases/{filename}"]
}
},
},
{
"name": "wayland-protocols",

4
glfw/wl_init.c vendored
View File

@ -152,7 +152,7 @@ static void setCursor(GLFWCursorShape shape, _GLFWwindow* window)
_glfw.wl.cursorThemeManager,
window->wl.cursorTheme,
_wlCursorPxFromScale(scale)
);
);
cursor = _glfwLoadCursor(shape, window->wl.cursorTheme);
if (!cursor) return;
// TODO: handle animated cursors too.
@ -788,7 +788,7 @@ int _glfwPlatformInit(void)
if (_glfw.wl.shm)
{
_glfw.wl.cursorThemeManager = _wlCursorThemeManagerDefault();
_glfw.wl.cursorSurface =
_glfw.wl.cursorSurface =
wl_compositor_create_surface(_glfw.wl.compositor);
}
else

View File

@ -8,7 +8,7 @@ set wildignore+=tags
set expandtab
set tabstop=4
set shiftwidth=4
set softtabstop=0
set softtabstop=0
set smarttab
python3 <<endpython
import sys