neovim

commit f899045adc16d19dd55f4d4af7f6b300bbe43acc
parent c785d5cdf062c8167e6de1b58d649707765c2c03
Author: Jesse van der Pluijm <jessevdp@hey.com>
Date:   Sat, 17 Jan 2026 10:33:50 +0100

refactor(startup): extract conflicting configs error to errors.h

Problem:
The E5422 error message was duplicated in two places in main.c, and
hardcoded error strings should be centralized in errors.h for consistency.

Solution:
Add e_conflicting_configs to errors.h and replace both inline error
strings with the centralized constant.

Diffstat:
M
src/nvim/errors.h
 | 
2
++
M
src/nvim/main.c
 | 
5
++---

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/nvim/errors.h b/src/nvim/errors.h
@@ -214,6 +214,8 @@ EXTERN const char e_diff_anchors_with_hidden_windows[] INIT( = N_("E1562: Diff a
 EXTERN const char e_trustfile[] INIT(= N_("E5570: Cannot update trust file: %s"));
 EXTERN const char e_cannot_read_from_str_2[] INIT(= N_("E282: Cannot read from \"%s\""));
 
+EXTERN const char e_conflicting_configs[] INIT(= N_("E5422: Conflicting configs: \"%s\" \"%s\""));
+
 EXTERN const char e_unknown_option2[] INIT(= N_("E355: Unknown option: %s"));
 
 EXTERN const char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM"));
diff --git a/src/nvim/main.c b/src/nvim/main.c
@@ -2049,8 +2049,7 @@ static bool do_user_initialization(void)
   if (os_path_exists(init_lua_path)
       && do_source(init_lua_path, true, DOSO_VIMRC, NULL)) {
     if (os_path_exists(user_vimrc)) {
-      semsg(_("E5422: Conflicting configs: \"%s\" \"%s\""), init_lua_path,
-            user_vimrc);
+      semsg(e_conflicting_configs, init_lua_path, user_vimrc);
     }
 
     xfree(user_vimrc);
@@ -2102,7 +2101,7 @@ static bool do_user_initialization(void)
       if (os_path_exists(init_lua)
           && do_source(init_lua, true, DOSO_VIMRC, NULL)) {
         if (os_path_exists(vimrc)) {
-          semsg(_("E5422: Conflicting configs: \"%s\" \"%s\""), init_lua, vimrc);
+          semsg(e_conflicting_configs, init_lua, vimrc);
         }
 
         xfree(vimrc);