From 22ed0141230b98ce8f52f5440cdc3417de07ef1a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 3 Feb 2019 19:59:02 +0530 Subject: [PATCH] Fix tabs being used for spaces in some source code files --- glfw/dbus_glfw.c | 8 ++++---- glfw/source-info.json | 8 ++++---- glfw/wl_window.c | 2 +- session.vim | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/glfw/dbus_glfw.c b/glfw/dbus_glfw.c index f16e49e7a..499ec1a63 100644 --- a/glfw/dbus_glfw.c +++ b/glfw/dbus_glfw.c @@ -318,15 +318,15 @@ glfw_dbus_connect_to_session_bus() { DBusError error; dbus_error_init(&error); if (session_bus) { - dbus_connection_unref(session_bus); - } + dbus_connection_unref(session_bus); + } session_bus = dbus_bus_get(DBUS_BUS_SESSION, &error); if (dbus_error_is_set(&error)) { report_error(&error, "Failed to connect to DBUS session bus"); session_bus = NULL; - return; + return; } - static const char *name = "session-bus"; + static const char *name = "session-bus"; if (!dbus_connection_set_watch_functions(session_bus, add_dbus_watch, remove_dbus_watch, toggle_dbus_watch, (void*)name, NULL)) { _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to set DBUS watches on connection to: %s", name); dbus_connection_close(session_bus); diff --git a/glfw/source-info.json b/glfw/source-info.json index 409ba2f69..1da7e1b69 100644 --- a/glfw/source-info.json +++ b/glfw/source-info.json @@ -65,7 +65,7 @@ "osmesa_context.h", "linux_joystick.h", "null_joystick.h", - "linux_notify.h" + "linux_notify.h" ], "protocols": [ "stable/xdg-shell/xdg-shell.xml", @@ -90,7 +90,7 @@ "backend_utils.c", "linux_joystick.c", "null_joystick.c", - "linux_notify.c" + "linux_notify.c" ] }, "wayland_protocols": [ @@ -131,7 +131,7 @@ "osmesa_context.h", "linux_joystick.h", "null_joystick.h", - "linux_notify.h" + "linux_notify.h" ], "sources": [ "x11_init.c", @@ -148,7 +148,7 @@ "backend_utils.c", "linux_joystick.c", "null_joystick.c", - "linux_notify.c" + "linux_notify.c" ] } } diff --git a/glfw/wl_window.c b/glfw/wl_window.c index cd9132eea..6ae9cd435 100644 --- a/glfw/wl_window.c +++ b/glfw/wl_window.c @@ -839,7 +839,7 @@ handleEvents(double timeout) wl_display_cancel_read(display); } glfw_ibus_dispatch(&_glfw.wl.xkb.ibus); - glfw_dbus_session_bus_dispatch(); + glfw_dbus_session_bus_dispatch(); } // Translates a GLFW standard cursor to a theme cursor name diff --git a/session.vim b/session.vim index b8d72312c..0949e19a0 100644 --- a/session.vim +++ b/session.vim @@ -7,7 +7,8 @@ set wildignore+=tags set expandtab set tabstop=4 set shiftwidth=4 - +set softtabstop=0 +set smarttab python <