From 486076a0e1ee3c7bb230e0f95a21607fadea96d4 Mon Sep 17 00:00:00 2001 From: bfredl Date: Fri, 11 Oct 2024 20:25:35 +0200 Subject: fix(build): remove USE_FNAME_CASE, redundant with CASE_INSENSITIVE_FILENAME It stands to reason, you need to "fix" case-insensitive filenames if-and-only-if you have case-insensitive filenames. --- src/nvim/buffer.c | 2 +- src/nvim/ex_cmds.c | 2 +- src/nvim/main.c | 2 +- src/nvim/path.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 4a87cebfa7..ce47705aa6 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -2985,7 +2985,7 @@ int setfname(buf_T *buf, char *ffname_arg, char *sfname_arg, bool message) close_buffer(NULL, obuf, DOBUF_WIPE, false, false); } sfname = xstrdup(sfname); -#ifdef USE_FNAME_CASE +#ifdef CASE_INSENSITIVE_FILENAME path_fix_case(sfname); // set correct case for short file name #endif if (buf->b_sfname != buf->b_ffname) { diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index a98de05815..d48d25fc22 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -2134,7 +2134,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum if (sfname == NULL) { sfname = ffname; } -#ifdef USE_FNAME_CASE +#ifdef CASE_INSENSITIVE_FILENAME if (sfname != NULL) { path_fix_case(sfname); // set correct case for sfname } diff --git a/src/nvim/main.c b/src/nvim/main.c index dc102f6f6d..b54b2a531a 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1448,7 +1448,7 @@ scripterror: p = r; } -#ifdef USE_FNAME_CASE +#ifdef CASE_INSENSITIVE_FILENAME // Make the case of the file name match the actual file. path_fix_case(p); #endif diff --git a/src/nvim/path.c b/src/nvim/path.c index 9cce504831..4c16adde4c 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1827,7 +1827,7 @@ char *fix_fname(const char *fname) fname = xstrdup(fname); -# ifdef USE_FNAME_CASE +# ifdef CASE_INSENSITIVE_FILENAME path_fix_case((char *)fname); // set correct case for file name # endif -- cgit