# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1658690106 -7200
# Node ID 44bb4a607125a7e6f4f328b7ac5a4584adc3b123
# Parent  f3e66922db6e84bfb4f27d1b939375a96c256d54
patch 9.0.0064: confusing error when using "q:" in command line window

Commit: https://github.com/vim/vim/commit/c963ec31a0c293d629e40cb082d4bfb1651def49
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jul 24 20:08:01 2022 +0100

    patch 9.0.0064: confusing error when using "q:" in command line window

    Problem:    Confusing error when using "q:" in command line window.
    Solution:   Check for the situation and give a better error message.
                (closes #10756)

diff --git a/src/errors.h b/src/errors.h
--- a/src/errors.h
+++ b/src/errors.h
@@ -3306,3 +3306,7 @@ EXTERN char e_substitute_nesting_too_dee
 EXTERN char e_invalid_argument_nr[]
 	INIT(= N_("E1291: Invalid argument: %ld"));
 #endif
+#ifdef FEAT_CMDWIN
+EXTERN char e_cmdline_window_already_open[]
+	INIT(= N_("E1292: Command-line window is already open"));
+#endif
diff --git a/src/normal.c b/src/normal.c
--- a/src/normal.c
+++ b/src/normal.c
@@ -7147,6 +7147,11 @@ nv_record(cmdarg_T *cap)
 #ifdef FEAT_CMDWIN
 	if (cap->nchar == ':' || cap->nchar == '/' || cap->nchar == '?')
 	{
+	    if (cmdwin_type != 0)
+	    {
+		emsg(_(e_cmdline_window_already_open));
+		return;
+	    }
 	    stuffcharReadbuff(cap->nchar);
 	    stuffcharReadbuff(K_CMDWIN);
 	}
diff --git a/src/testdir/test_cmdwin.vim b/src/testdir/test_cmdwin.vim
--- a/src/testdir/test_cmdwin.vim
+++ b/src/testdir/test_cmdwin.vim
@@ -356,5 +356,14 @@ func Test_cmdwin_ctrl_bsl()
   call assert_equal('', getcmdwintype())
 endfunc
 
+func Test_cant_open_cmdwin_in_cmdwin()
+  try
+    call feedkeys("q:q::q\<CR>", "x!")
+  catch
+    let caught = v:exception
+  endtry
+  call assert_match('E1292:', caught)
+endfunc
+
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    64,
+/**/
     63,
 /**/
     62,