11 files changed, 29 insertions, 19 deletions

diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index edf13b073c..bd3482c85f 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -254,7 +254,8 @@ void nvim_ui_detach(uint64_t channel_id, Error *err)
 
 // TODO(bfredl): use me to detach a specific ui from the server
 void remote_ui_stop(UI *ui)
-{}
+{
+}
 
 void nvim_ui_try_resize(uint64_t channel_id, Integer width, Integer height, Error *err)
   FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index d9226214c6..d903d498e7 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -2265,7 +2265,8 @@ static void f_fnamemodify(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 
 /// "foreground()" function
 static void f_foreground(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
-{}
+{
+}
 
 static void f_funcref(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 {
@@ -2941,7 +2942,8 @@ static void f_gettagstack(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 
 /// Dummy timer callback. Used by f_wait().
 static void dummy_timer_due_cb(TimeWatcher *tw, void *data)
-{}
+{
+}
 
 /// Dummy timer close callback. Used by f_wait().
 static void dummy_timer_close_cb(TimeWatcher *tw, void *data)
diff --git a/src/nvim/log.c b/src/nvim/log.c
index 4de0c4d88c..afe3d95e9a 100644
--- a/src/nvim/log.c
+++ b/src/nvim/log.c
@@ -131,7 +131,7 @@ void log_unlock(void)
 /// @return true if log was emitted normally, false if failed or recursive
 bool logmsg(int log_level, const char *context, const char *func_name, int line_num, bool eol,
             const char *fmt, ...)
-  FUNC_ATTR_UNUSED FUNC_ATTR_PRINTF(6, 7)
+  FUNC_ATTR_PRINTF(6, 7)
 {
   static bool recursive = false;
   static bool did_msg = false;  // Showed recursion message?
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index 3646fd876b..13a0c4b0cd 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -377,7 +377,8 @@ static int nlua_schedule(lua_State *const lstate)
 
 // Dummy timer callback. Used by f_wait().
 static void dummy_timer_due_cb(TimeWatcher *tw, void *data)
-{}
+{
+}
 
 // Dummy timer close callback. Used by f_wait().
 static void dummy_timer_close_cb(TimeWatcher *tw, void *data)
diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index 242e3c381a..57cb298572 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -91,7 +91,7 @@
 # define MCH_OPEN_RW(n, f)      os_open((n), (f), 0)
 #endif
 
-#define REPLACE_NORMAL(s) (((s) & REPLACE_FLAG) && !((s) & VREPLACE_FLAG))
+#define REPLACE_NORMAL(s) (((s)& REPLACE_FLAG) && !((s)& VREPLACE_FLAG))
 
 // MB_PTR_ADV(): advance a pointer to the next character, taking care of
 // multi-byte characters if needed. Skip over composing chars.
diff --git a/src/nvim/msgpack_rpc/unpacker.c b/src/nvim/msgpack_rpc/unpacker.c
index 44a16beb48..25edf2e21d 100644
--- a/src/nvim/msgpack_rpc/unpacker.c
+++ b/src/nvim/msgpack_rpc/unpacker.c
@@ -179,7 +179,8 @@ static void api_parse_enter(mpack_parser_t *parser, mpack_node_t *node)
 }
 
 static void api_parse_exit(mpack_parser_t *parser, mpack_node_t *node)
-{}
+{
+}
 
 void unpacker_init(Unpacker *p)
 {
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 5fcdf5d4c1..2bafeccba4 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -2180,7 +2180,8 @@ static void nv_ignore(cmdarg_T *cap)
 /// Command character that doesn't do anything, but unlike nv_ignore() does
 /// start edit().  Used for "startinsert" executed while starting up.
 static void nv_nop(cmdarg_T *cap)
-{}
+{
+}
 
 /// Command character doesn't exist.
 static void nv_error(cmdarg_T *cap)
diff --git a/src/nvim/os/os_defs.h b/src/nvim/os/os_defs.h
index 9e201f1dfa..c595013a21 100644
--- a/src/nvim/os/os_defs.h
+++ b/src/nvim/os/os_defs.h
@@ -57,49 +57,49 @@
 // stat macros
 #ifndef S_ISDIR
 # ifdef S_IFDIR
-#  define S_ISDIR(m)    (((m) & S_IFMT) == S_IFDIR)
+#  define S_ISDIR(m)    (((m)& S_IFMT) == S_IFDIR)
 # else
 #  define S_ISDIR(m)    0
 # endif
 #endif
 #ifndef S_ISREG
 # ifdef S_IFREG
-#  define S_ISREG(m)    (((m) & S_IFMT) == S_IFREG)
+#  define S_ISREG(m)    (((m)& S_IFMT) == S_IFREG)
 # else
 #  define S_ISREG(m)    0
 # endif
 #endif
 #ifndef S_ISBLK
 # ifdef S_IFBLK
-#  define S_ISBLK(m)    (((m) & S_IFMT) == S_IFBLK)
+#  define S_ISBLK(m)    (((m)& S_IFMT) == S_IFBLK)
 # else
 #  define S_ISBLK(m)    0
 # endif
 #endif
 #ifndef S_ISSOCK
 # ifdef S_IFSOCK
-#  define S_ISSOCK(m)   (((m) & S_IFMT) == S_IFSOCK)
+#  define S_ISSOCK(m)   (((m)& S_IFMT) == S_IFSOCK)
 # else
 #  define S_ISSOCK(m)   0
 # endif
 #endif
 #ifndef S_ISFIFO
 # ifdef S_IFIFO
-#  define S_ISFIFO(m)   (((m) & S_IFMT) == S_IFIFO)
+#  define S_ISFIFO(m)   (((m)& S_IFMT) == S_IFIFO)
 # else
 #  define S_ISFIFO(m)   0
 # endif
 #endif
 #ifndef S_ISCHR
 # ifdef S_IFCHR
-#  define S_ISCHR(m)    (((m) & S_IFMT) == S_IFCHR)
+#  define S_ISCHR(m)    (((m)& S_IFMT) == S_IFCHR)
 # else
 #  define S_ISCHR(m)    0
 # endif
 #endif
 #ifndef S_ISLNK
 # ifdef S_IFLNK
-#  define S_ISLNK(m)    (((m) & S_IFMT) == S_IFLNK)
+#  define S_ISLNK(m)    (((m)& S_IFMT) == S_IFLNK)
 # else
 #  define S_ISLNK(m)    0
 # endif
diff --git a/src/nvim/os/pty_process_win.c b/src/nvim/os/pty_process_win.c
index 6233a90638..2e850f8c22 100644
--- a/src/nvim/os/pty_process_win.c
+++ b/src/nvim/os/pty_process_win.c
@@ -172,11 +172,13 @@ void pty_process_close(PtyProcess *ptyproc)
 
 void pty_process_close_master(PtyProcess *ptyproc)
   FUNC_ATTR_NONNULL_ALL
-{}
+{
+}
 
 void pty_process_teardown(Loop *loop)
   FUNC_ATTR_NONNULL_ALL
-{}
+{
+}
 
 static void pty_process_connect_cb(uv_connect_t *req, int status)
   FUNC_ATTR_NONNULL_ALL
diff --git a/src/nvim/plines.c b/src/nvim/plines.c
index a3e5640b18..64a2e0bb61 100644
--- a/src/nvim/plines.c
+++ b/src/nvim/plines.c
@@ -302,7 +302,8 @@ void init_chartabsize_arg(chartabsize_T *cts, win_T *wp, linenr_T lnum FUNC_ATTR
 
 /// Free any allocated item in "cts".
 void clear_chartabsize_arg(chartabsize_T *cts)
-{}
+{
+}
 
 /// like win_chartabsize(), but also check for line breaks on the screen
 ///
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index df7c87ad60..eecaa8c55a 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -1369,7 +1369,8 @@ void tui_set_title(TUIData *tui, String title)
 }
 
 void tui_set_icon(TUIData *tui, String icon)
-{}
+{
+}
 
 void tui_screenshot(TUIData *tui, String path)
 {