patch 7.4.2226
Problem: The field names used by getbufinfo(), gettabinfo() and
getwininfo() are not consistent.
Solution: Use bufnr, winnr and tabnr. (Yegappan Lakshmanan)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 5352630..16e2365 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3931,7 +3931,7 @@
if (dict == NULL)
return NULL;
- dict_add_nr_str(dict, "nr", buf->b_fnum, NULL);
+ dict_add_nr_str(dict, "bufnr", buf->b_fnum, NULL);
dict_add_nr_str(dict, "name", 0L,
buf->b_ffname != NULL ? buf->b_ffname : (char_u *)"");
dict_add_nr_str(dict, "lnum", buflist_findlnum(buf), NULL);
@@ -5001,7 +5001,7 @@
if (dict == NULL)
return NULL;
- dict_add_nr_str(dict, "nr", tp_idx, NULL);
+ dict_add_nr_str(dict, "tabnr", tp_idx, NULL);
l = list_alloc();
if (l != NULL)
@@ -5125,12 +5125,12 @@
if (dict == NULL)
return NULL;
- dict_add_nr_str(dict, "tpnr", tpnr, NULL);
- dict_add_nr_str(dict, "nr", winnr, NULL);
+ dict_add_nr_str(dict, "tabnr", tpnr, NULL);
+ dict_add_nr_str(dict, "winnr", winnr, NULL);
dict_add_nr_str(dict, "winid", wp->w_id, NULL);
dict_add_nr_str(dict, "height", wp->w_height, NULL);
dict_add_nr_str(dict, "width", wp->w_width, NULL);
- dict_add_nr_str(dict, "bufnum", wp->w_buffer->b_fnum, NULL);
+ dict_add_nr_str(dict, "bufnr", wp->w_buffer->b_fnum, NULL);
#ifdef FEAT_QUICKFIX
dict_add_nr_str(dict, "quickfix", bt_quickfix(wp->w_buffer), NULL);