aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-09-08 09:22:38 +0800
committerGitHub <noreply@github.com>2022-09-08 09:22:38 +0800
commit078e49b96a4f3e4255371cd40c18295bab2149d0 (patch)
treeffbfa97fe274f8a08dd01eb0e10c24e38df813ef
parente93f22f28abe8f774c5e081073cb2eac0f5085fd (diff)
parent06f9da547cbcc0b12c2d946a0abe0aee0bad4011 (diff)
downloadrneovim-078e49b96a4f3e4255371cd40c18295bab2149d0.tar.gz
rneovim-078e49b96a4f3e4255371cd40c18295bab2149d0.tar.bz2
rneovim-078e49b96a4f3e4255371cd40c18295bab2149d0.zip
Merge pull request #20112 from zeertzjq/vim-9.0.0410
vim-patch:9.0.{0410,0412}: unused cts_lnum
-rw-r--r--src/nvim/plines.c5
-rw-r--r--src/nvim/plines.h1
2 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/plines.c b/src/nvim/plines.c
index c676dcddbd..cbde0cfff9 100644
--- a/src/nvim/plines.c
+++ b/src/nvim/plines.c
@@ -288,11 +288,10 @@ unsigned int win_linetabsize(win_T *wp, linenr_T lnum, char_u *line, colnr_T len
///
/// "line" is the start of the line, "ptr" is the first relevant character.
/// When "lnum" is zero do not use text properties that insert text.
-void init_chartabsize_arg(chartabsize_T *cts, win_T *wp, linenr_T lnum, colnr_T col, char *line,
- char *ptr)
+void init_chartabsize_arg(chartabsize_T *cts, win_T *wp, linenr_T lnum FUNC_ATTR_UNUSED,
+ colnr_T col, char *line, char *ptr)
{
cts->cts_win = wp;
- cts->cts_lnum = lnum;
cts->cts_vcol = col;
cts->cts_line = line;
cts->cts_ptr = ptr;
diff --git a/src/nvim/plines.h b/src/nvim/plines.h
index 7b228f3e91..f463d82f10 100644
--- a/src/nvim/plines.h
+++ b/src/nvim/plines.h
@@ -6,7 +6,6 @@
// Argument for lbr_chartabsize().
typedef struct {
win_T *cts_win;
- linenr_T cts_lnum; // zero when not using text properties
char *cts_line; // start of the line
char *cts_ptr; // current position in line