3 files changed, 10 insertions, 25 deletions
diff --git a/src/gen/gen_eval.lua b/src/gen/gen_eval.lua
index 9d2f2f7523..2f2d09485b 100644
--- a/src/gen/gen_eval.lua
+++ b/src/gen/gen_eval.lua
@@ -16,6 +16,7 @@ hashpipe:write([[
 #include "nvim/arglist.h"
 #include "nvim/cmdexpand.h"
 #include "nvim/cmdhist.h"
+#include "nvim/diff.h"
 #include "nvim/digraph.h"
 #include "nvim/eval.h"
 #include "nvim/eval/buffer.h"
diff --git a/src/gen/gen_help_html.lua b/src/gen/gen_help_html.lua
index 0d98d9e1b1..817811e857 100644
--- a/src/gen/gen_help_html.lua
+++ b/src/gen/gen_help_html.lua
@@ -76,6 +76,7 @@ local new_layout = {
   ['news.txt'] = true,
   ['news-0.9.txt'] = true,
   ['news-0.10.txt'] = true,
+  ['news-0.11.txt'] = true,
   ['nvim.txt'] = true,
   ['provider.txt'] = true,
   ['tui.txt'] = true,
diff --git a/src/gen/gen_keycodes.lua b/src/gen/gen_keycodes.lua
index 6fbfb5190f..584f0a3d36 100644
--- a/src/gen/gen_keycodes.lua
+++ b/src/gen/gen_keycodes.lua
@@ -38,43 +38,26 @@ hashorder, hashfun = hashy.hashy_hash('get_special_key_code', hashorder, functio
   return 'key_names_table[' .. idx .. '].name.data'
 end, true)
 
---- @type table<string,integer>
---- Maps keys to the (after hash) indexes of the entries with preferred names.
-local key_hash_idx = {}
-
-local name_orig_idx_ = vim.deepcopy(name_orig_idx)
-for i, lower_name in ipairs(hashorder) do
-  local orig_idx = table.remove(name_orig_idx_[lower_name], 1)
-  local keycode = keycode_names[orig_idx]
-  local key = keycode[1]
-  if key_orig_idx[key] == orig_idx then
-    key_hash_idx[key] = i
-  end
-end
-assert(vim.iter(vim.tbl_values(name_orig_idx_)):all(vim.tbl_isempty))
-
 local names_tgt = assert(io.open(names_file, 'w'))
 names_tgt:write([[
 static const struct key_name_entry {
-  int key;                  ///< Special key code or ascii value
-  String name;              ///< Name of key
-  const String *pref_name;  ///< Pointer to preferred key name
-                            ///< (may be NULL or point to the name in another entry)
+  int key;      ///< Special key code or ascii value
+  bool is_alt;  ///< Is an alternative name
+  String name;  ///< Name of key
 } key_names_table[] = {]])
 
-name_orig_idx_ = vim.deepcopy(name_orig_idx)
-for i, lower_name in ipairs(hashorder) do
+local name_orig_idx_ = vim.deepcopy(name_orig_idx)
+for _, lower_name in ipairs(hashorder) do
   local orig_idx = table.remove(name_orig_idx_[lower_name], 1)
   local keycode = keycode_names[orig_idx]
   local key = keycode[1]
   local name = keycode[2]
-  local pref_idx = key_hash_idx[key]
   names_tgt:write(
-    ('\n  {%s, {"%s", %u}, %s},'):format(
+    ('\n  {%s, %s, {"%s", %u}},'):format(
       key,
+      key_orig_idx[key] == orig_idx and 'false' or 'true',
       name,
-      #name,
-      pref_idx == i and 'NULL' or ('&key_names_table[%u].name'):format(pref_idx - 1)
+      #name
     )
   )
 end