globals: eliminate "enc_utf8" macro

"enc_utf8" macro evaluates to "true".
Continue dead code removal, started in https://github.com/neovim/neovim/pull/13275.

3 files changed, 10 insertions, 22 deletions

diff --git a/src/nvim/change.c b/src/nvim/change.c
index 271d350967..0f5081c94c 100644
--- a/src/nvim/change.c
+++ b/src/nvim/change.c
@@ -530,12 +530,8 @@ void ins_bytes_len(char_u *p, size_t len)
 {
   size_t n;
   for (size_t i = 0; i < len; i += n) {
-    if (enc_utf8) {
-      // avoid reading past p[len]
-      n = (size_t)utfc_ptr2len_len(p + i, (int)(len - i));
-    } else {
-      n = (size_t)(*mb_ptr2len)(p + i);
-    }
+    // avoid reading past p[len]
+    n = (size_t)utfc_ptr2len_len(p + i, (int)(len - i));
     ins_char_bytes(p + i, n);
   }
 }
@@ -761,7 +757,7 @@ int del_bytes(colnr_T count, bool fixpos_arg, bool use_delcombine)
 
   // If 'delcombine' is set and deleting (less than) one character, only
   // delete the last combining character.
-  if (p_deco && use_delcombine && enc_utf8
+  if (p_deco && use_delcombine
       && utfc_ptr2len(oldp + col) >= count) {
     int cc[MAX_MCO];
     int n;
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 49de0f3bf8..6ee3a3f579 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -1310,14 +1310,11 @@ retry:
         char_u  *dest;
         char_u  *tail = NULL;
 
-        /*
-         * "enc_utf8" set: Convert Unicode or Latin1 to UTF-8.
-         * "enc_utf8" not set: Convert Unicode to Latin1.
-         * Go from end to start through the buffer, because the number
-         * of bytes may increase.
-         * "dest" points to after where the UTF-8 bytes go, "p" points
-         * to after the next character to convert.
-         */
+        // Convert Unicode or Latin1 to UTF-8.
+        // Go from end to start through the buffer, because the number
+        // of bytes may increase.
+        // "dest" points to after where the UTF-8 bytes go, "p" points
+        // to after the next character to convert.
         dest = ptr + real_size;
         if (fio_flags == FIO_LATIN1 || fio_flags == FIO_UTF8) {
           p = ptr + size;
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 7247c7e4d0..566a5ae9d6 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -585,8 +585,8 @@ EXTERN int vr_lines_changed INIT(= 0);      // #Lines changed by "gR" so far
 EXTERN int inhibit_delete_count INIT(= 0);
 
 // These flags are set based upon 'fileencoding'.
-// Note that "enc_utf8" is also set for "unicode", because the characters are
-// internally stored as UTF-8 (to avoid trouble with NUL bytes).
+// The characters are internally stored as UTF-8
+// to avoid trouble with NUL bytes.
 # define DBCS_JPN       932     // japan
 # define DBCS_JPNU      9932    // euc-jp
 # define DBCS_KOR       949     // korea
@@ -598,11 +598,6 @@ EXTERN int inhibit_delete_count INIT(= 0);
 # define DBCS_2BYTE     1       // 2byte-
 # define DBCS_DEBUG     -1
 
-// mbyte flags that used to depend on 'encoding'. These are now deprecated, as
-// 'encoding' is always "utf-8". Code that use them can be refactored to
-// remove dead code.
-#define enc_utf8 true
-
 /// Encoding used when 'fencs' is set to "default"
 EXTERN char_u *fenc_default INIT(= NULL);