patch 8.2.3254: win_gettype() does not recognize a quickfix window
Problem: win_gettype() does not recognize a quickfix window.
Solution: Add "quickfix" and "loclist". (Yegappan Lakshmanan, closes #8676)
diff --git a/src/evalwindow.c b/src/evalwindow.c
index 737ca7d..f043c6f 100644
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -953,6 +953,12 @@
else if (wp == curwin && cmdwin_type != 0)
rettv->vval.v_string = vim_strsave((char_u *)"command");
#endif
+#ifdef FEAT_QUICKFIX
+ else if (bt_quickfix(wp->w_buffer))
+ rettv->vval.v_string = vim_strsave((char_u *)
+ (wp->w_llist_ref != NULL ? "loclist" : "quickfix"));
+#endif
+
}
/*
diff --git a/src/misc2.c b/src/misc2.c
index bbf55bb..2e83d2d 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1574,10 +1574,10 @@
{
if (s == NULL || *s == NUL)
return;
- if (ga_grow(gap, len) == OK)
+ if (ga_grow(gap, (int)len) == OK)
{
- mch_memmove((char *)gap->ga_data + gap->ga_len, s, (size_t)len);
- gap->ga_len += len;
+ mch_memmove((char *)gap->ga_data + gap->ga_len, s, len);
+ gap->ga_len += (int)len;
}
}
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index e5a6d6c..e22f6b2 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -5587,4 +5587,21 @@
%bwipe!
endfunc
+" Test for win_gettype() in quickfix and location list windows
+func Test_win_gettype()
+ copen
+ call assert_equal("quickfix", win_gettype())
+ let wid = win_getid()
+ wincmd p
+ call assert_equal("quickfix", win_gettype(wid))
+ cclose
+ lexpr ''
+ lopen
+ call assert_equal("loclist", win_gettype())
+ let wid = win_getid()
+ wincmd p
+ call assert_equal("loclist", win_gettype(wid))
+ lclose
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index b01127c..c901996 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3254,
+/**/
3253,
/**/
3252,