commit 92403697746a3ebaeb4ad267da2c7eb9c0e7b0bb
author zeertzjq <zeertzjq@outlook.com> Mon Apr 28 18:04:00 2025 +0200
committer Christian Brabandt <cb@256bit.org> Mon Apr 28 18:04:00 2025 +0200
tree 5c564338a9921605d87e951905ed2b0676621cd5
parent 6220bbad4ee4f41398680fcfad6119398477eaa6

patch 9.1.1351: Return value of getcmdline() inconsistent in CmdlineLeavePre

Problem:  Return value of getcmdline() inconsistent in CmdlineLeavePre
          when leaving cmdline in different ways (after v9.1.1329).
Solution: Trigger CmdlineLeavePre before calling abandon_cmdline() so
          that getcmdline() can return the command line (zeertzjq).

closes: #17218

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Girish Palya <girishji@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

src/ex_getln.c

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 24ff7a9..bbfe1e5 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2560,6 +2560,9 @@
     }
 
 returncmd:
+    // Trigger CmdlineLeavePre autocommands if not already triggered.
+    if (!event_cmdlineleavepre_triggered)
+	trigger_cmd_autocmd(cmdline_type, EVENT_CMDLINELEAVEPRE);
 
 #ifdef FEAT_RIGHTLEFT
     cmdmsg_rl = FALSE;
@@ -2616,10 +2619,6 @@
     if (some_key_typed)
 	need_wait_return = FALSE;
 
-    // Trigger CmdlineLeavePre autocommands if not already triggered.
-    if (!event_cmdlineleavepre_triggered)
-	trigger_cmd_autocmd(cmdline_type, EVENT_CMDLINELEAVEPRE);
-
     // Trigger CmdlineLeave autocommands.
     trigger_cmd_autocmd(cmdline_type, EVENT_CMDLINELEAVE);