From aa420cd54a5813cefd4bda16c07a4ba379956034 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 28 Oct 2025 07:32:26 +0000
Subject: [PATCH] Tweak error messages so that file name isn't modified when we
 capitalize the first letter, from Pavel Roskin in GitHub issue 4666.

---
 cmd-load-buffer.c | 2 +-
 cmd-save-buffer.c | 2 +-
 cmd-source-file.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 70fd7ed9..82ac2fd4 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -66,7 +66,7 @@ cmd_load_buffer_done(__unused struct client *c, const char *path, int error,
 		return;
 
 	if (error != 0)
-		cmdq_error(item, "%s: %s", path, strerror(error));
+		cmdq_error(item, "%s: %s", strerror(error), path);
 	else if (bsize != 0) {
 		copy = xmalloc(bsize);
 		memcpy(copy, bdata, bsize);
diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index baaa3467..d4266231 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -66,7 +66,7 @@ cmd_save_buffer_done(__unused struct client *c, const char *path, int error,
 		return;
 
 	if (error != 0)
-		cmdq_error(item, "%s: %s", path, strerror(error));
+		cmdq_error(item, "%s: %s", strerror(error), path);
 	cmdq_continue(item);
 }
 
diff --git a/cmd-source-file.c b/cmd-source-file.c
index 3da3f0da..b46e6b94 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -115,7 +115,7 @@ cmd_source_file_done(struct client *c, const char *path, int error,
 		return;
 
 	if (error != 0)
-		cmdq_error(item, "%s: %s", path, strerror(error));
+		cmdq_error(item, "%s: %s", strerror(error), path);
 	else if (bsize != 0) {
 		if (load_cfg_from_buffer(bdata, bsize, path, c, cdata->after,
 		    target, cdata->flags, &new_item) < 0)
@@ -234,7 +234,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
 					error = strerror(ENOMEM);
 				else
 					error = strerror(EINVAL);
-				cmdq_error(item, "%s: %s", path, error);
+				cmdq_error(item, "%s: %s", error, path);
 				retval = CMD_RETURN_ERROR;
 			}
 			globfree(&g);