From e6e3989c1b3f18907a0c305712b867e9a3821369 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 25 Oct 2018 12:32:11 +0200 Subject: patch 8.1.0493: argv() and argc() only work on the current argument list Problem: argv() and argc() only work on the current argument list. Solution: Add a window ID argument. (Yegappan Lakshmanan, closes #832) --- src/eval.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/eval.c') diff --git a/src/eval.c b/src/eval.c index 7c462fb6a..e70bfd8ab 100644 --- a/src/eval.c +++ b/src/eval.c @@ -8193,9 +8193,7 @@ find_win_by_nr( tabpage_T *tp) /* NULL for current tab page */ { win_T *wp; - int nr; - - nr = (int)get_tv_number_chk(vp, NULL); + int nr = (int)get_tv_number_chk(vp, NULL); if (nr < 0) return NULL; @@ -8217,6 +8215,20 @@ find_win_by_nr( return wp; } +/* + * Find a window: When using a Window ID in any tab page, when using a number + * in the current tab page. + */ + win_T * +find_win_by_nr_or_id(typval_T *vp) +{ + int nr = (int)get_tv_number_chk(vp, NULL); + + if (nr >= LOWEST_WIN_ID) + return win_id2wp(vp); + return find_win_by_nr(vp, NULL); +} + /* * Find window specified by "wvp" in tabpage "tvp". */ -- cgit v1.2.1