To: vim_dev@googlegroups.com Subject: Patch 7.4.1892 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1892 Problem: balloon eval only gets the window number, not the ID. Solution: Add v:beval_winid. Files: src/eval.c, src/gui_beval.c, src/vim.h *** ../vim-7.4.1891/src/eval.c 2016-06-02 17:46:16.244499026 +0200 --- src/eval.c 2016-06-04 17:35:13.990131134 +0200 *************** *** 349,354 **** --- 349,355 ---- {VV_NAME("fcs_choice", VAR_STRING), 0}, {VV_NAME("beval_bufnr", VAR_NUMBER), VV_RO}, {VV_NAME("beval_winnr", VAR_NUMBER), VV_RO}, + {VV_NAME("beval_winid", VAR_NUMBER), VV_RO}, {VV_NAME("beval_lnum", VAR_NUMBER), VV_RO}, {VV_NAME("beval_col", VAR_NUMBER), VV_RO}, {VV_NAME("beval_text", VAR_STRING), VV_RO}, *** ../vim-7.4.1891/src/gui_beval.c 2016-04-17 20:49:46.133819400 +0200 --- src/gui_beval.c 2016-06-04 17:36:27.310130126 +0200 *************** *** 61,66 **** --- 61,67 ---- set_vim_var_nr(VV_BEVAL_BUFNR, (long)wp->w_buffer->b_fnum); set_vim_var_nr(VV_BEVAL_WINNR, winnr); + set_vim_var_nr(VV_BEVAL_WINID, wp->w_id); set_vim_var_nr(VV_BEVAL_LNUM, (long)lnum); set_vim_var_nr(VV_BEVAL_COL, (long)(col + 1)); set_vim_var_string(VV_BEVAL_TEXT, text, -1); *** ../vim-7.4.1891/src/vim.h 2016-05-29 16:24:45.953320300 +0200 --- src/vim.h 2016-06-04 17:36:59.334129685 +0200 *************** *** 1877,1911 **** #define VV_FCS_CHOICE 38 #define VV_BEVAL_BUFNR 39 #define VV_BEVAL_WINNR 40 ! #define VV_BEVAL_LNUM 41 ! #define VV_BEVAL_COL 42 ! #define VV_BEVAL_TEXT 43 ! #define VV_SCROLLSTART 44 ! #define VV_SWAPNAME 45 ! #define VV_SWAPCHOICE 46 ! #define VV_SWAPCOMMAND 47 ! #define VV_CHAR 48 ! #define VV_MOUSE_WIN 49 ! #define VV_MOUSE_LNUM 50 ! #define VV_MOUSE_COL 51 ! #define VV_OP 52 ! #define VV_SEARCHFORWARD 53 ! #define VV_HLSEARCH 54 ! #define VV_OLDFILES 55 ! #define VV_WINDOWID 56 ! #define VV_PROGPATH 57 ! #define VV_COMPLETED_ITEM 58 ! #define VV_OPTION_NEW 59 ! #define VV_OPTION_OLD 60 ! #define VV_OPTION_TYPE 61 ! #define VV_ERRORS 62 ! #define VV_FALSE 63 ! #define VV_TRUE 64 ! #define VV_NULL 65 ! #define VV_NONE 66 ! #define VV_VIM_DID_ENTER 67 ! #define VV_TESTING 68 ! #define VV_LEN 69 /* number of v: vars */ /* used for v_number in VAR_SPECIAL */ #define VVAL_FALSE 0L --- 1877,1912 ---- #define VV_FCS_CHOICE 38 #define VV_BEVAL_BUFNR 39 #define VV_BEVAL_WINNR 40 ! #define VV_BEVAL_WINID 41 ! #define VV_BEVAL_LNUM 42 ! #define VV_BEVAL_COL 43 ! #define VV_BEVAL_TEXT 44 ! #define VV_SCROLLSTART 45 ! #define VV_SWAPNAME 46 ! #define VV_SWAPCHOICE 47 ! #define VV_SWAPCOMMAND 48 ! #define VV_CHAR 49 ! #define VV_MOUSE_WIN 50 ! #define VV_MOUSE_LNUM 51 ! #define VV_MOUSE_COL 52 ! #define VV_OP 53 ! #define VV_SEARCHFORWARD 54 ! #define VV_HLSEARCH 55 ! #define VV_OLDFILES 56 ! #define VV_WINDOWID 57 ! #define VV_PROGPATH 58 ! #define VV_COMPLETED_ITEM 59 ! #define VV_OPTION_NEW 60 ! #define VV_OPTION_OLD 61 ! #define VV_OPTION_TYPE 62 ! #define VV_ERRORS 63 ! #define VV_FALSE 64 ! #define VV_TRUE 65 ! #define VV_NULL 66 ! #define VV_NONE 67 ! #define VV_VIM_DID_ENTER 68 ! #define VV_TESTING 69 ! #define VV_LEN 70 /* number of v: vars */ /* used for v_number in VAR_SPECIAL */ #define VVAL_FALSE 0L *** ../vim-7.4.1891/src/version.c 2016-06-04 17:17:07.046146086 +0200 --- src/version.c 2016-06-04 17:40:33.730126736 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1892, /**/ -- Microsoft is to software what McDonalds is to gourmet cooking /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///