From 5940a3415babfa0fdfeb6bcd165cc7c369a819a4 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sun, 10 Oct 2021 01:38:50 +0200
Subject: vim-patch:8.2.3490: superfluous return statements #15978

Problem:    Superfluous return statements.
Solution:   Remove superfluous return statements from void functions.
            (closes vim/vim#8977)
https://github.com/vim/vim/commit/3826c0513bc9370583be550c864358c7eeb5605a
---
 src/nvim/buffer.c  | 2 --
 src/nvim/getchar.c | 1 -
 src/nvim/memline.c | 2 --
 src/nvim/move.c    | 1 -
 src/nvim/option.c  | 2 --
 5 files changed, 8 deletions(-)

(limited to 'src')

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 20dd94622f..6d91632dcd 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -2553,8 +2553,6 @@ void buflist_setfpos(buf_T *const buf, win_T *const win, linenr_T lnum, colnr_T
   if (wip->wi_next) {
     wip->wi_next->wi_prev = wip;
   }
-
-  return;
 }
 
 
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index f5f8a307d1..a53742b17b 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -293,7 +293,6 @@ static void add_buff(buffheader_T *const buf, const char *const s, ptrdiff_t sle
     buf->bh_curr->b_next = p;
     buf->bh_curr = p;
   }
-  return;
 }
 
 /*
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 69598bbdda..20ae5a4042 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -1272,7 +1272,6 @@ theend:
     apply_autocmds(EVENT_BUFREADPOST, NULL, curbuf->b_fname, FALSE, curbuf);
     apply_autocmds(EVENT_BUFWINENTER, NULL, curbuf->b_fname, FALSE, curbuf);
   }
-  return;
 }
 
 /// Find the names of swap files in current directory and the directory given
@@ -2798,7 +2797,6 @@ void ml_clearmarked(void)
   }
 
   lowest_marked = 0;
-  return;
 }
 
 size_t ml_flush_deleted_bytes(buf_T *buf, size_t *codepoints, size_t *codeunits)
diff --git a/src/nvim/move.c b/src/nvim/move.c
index c4f8e81fa3..918e0a5c4f 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -2104,7 +2104,6 @@ static void get_scroll_overlap(lineoff_T *lp, int dir)
   } else {
     *lp = loff2;        // 2 lines overlap
   }
-  return;
 }
 
 // Scroll 'scroll' lines up or down.
diff --git a/src/nvim/option.c b/src/nvim/option.c
index b60699b66f..a9bff8285c 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -6509,8 +6509,6 @@ void set_context_in_set_cmd(expand_T *xp, char_u *arg, int opt_flags)
       break;
     }
   }
-
-  return;
 }
 
 int ExpandSettings(expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file)
-- 
cgit