1 files changed, 9 insertions, 0 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index ddfb4e6ef3..bcd955d1b0 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -6821,10 +6821,19 @@ void win_id2tabwin(typval_T *const argvars, typval_T *const rettv)
 
 win_T * win_id2wp(typval_T *argvars)
 {
+  return win_id2wp_tp(argvars, NULL);
+}
+
+// Return the window and tab pointer of window "id".
+win_T * win_id2wp_tp(typval_T *argvars, tabpage_T **tpp)
+{
   int id = tv_get_number(&argvars[0]);
 
   FOR_ALL_TAB_WINDOWS(tp, wp) {
     if (wp->handle == id) {
+      if (tpp != NULL) {
+        *tpp = tp;
+      }
       return wp;
     }
   }