diff options
Diffstat (limited to 'data/vim/patches/8.1.1403')
-rw-r--r-- | data/vim/patches/8.1.1403 | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/data/vim/patches/8.1.1403 b/data/vim/patches/8.1.1403 deleted file mode 100644 index cd8018dd2..000000000 --- a/data/vim/patches/8.1.1403 +++ /dev/null @@ -1,122 +0,0 @@ -To: vim_dev@googlegroups.com -Subject: Patch 8.1.1403 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 8.1.1403 -Problem: Cannot build without the timer feature. -Solution: Add #ifdef. -Files: src/structs.h, src/window.c, src/popupwin.c, - src/testdir/test_popupwin.vim - - -*** ../vim-8.1.1402/src/structs.h 2019-05-26 20:10:02.604276366 +0200 ---- src/structs.h 2019-05-26 20:37:16.352032625 +0200 -*************** -*** 2874,2880 **** ---- 2874,2882 ---- - int w_zindex; - int w_maxheight; // "maxheight" for popup window - int w_maxwidth; // "maxwidth" for popup window -+ # if defined(FEAT_TIMERS) - timer_T *w_popup_timer; // timer for closing popup window -+ # endif - #endif - - -*** ../vim-8.1.1402/src/window.c 2019-05-26 20:10:02.604276366 +0200 ---- src/window.c 2019-05-26 20:38:09.435769462 +0200 -*************** -*** 4859,4864 **** ---- 4859,4865 ---- - return wp == aucmd_win || bt_popup(wp->w_buffer); - } - -+ #if defined(FEAT_TEXT_PROP) || defined(PROTO) - /* - * Free a popup window. This does not take the window out of the window list - * and assumes there is only one toplevel frame, no split. -*************** -*** 4867,4877 **** ---- 4868,4881 ---- - win_free_popup(win_T *win) - { - win_close_buffer(win, TRUE, FALSE); -+ # if defined(FEAT_TIMERS) - if (win->w_popup_timer != NULL) - stop_timer(win->w_popup_timer); -+ # endif - vim_free(win->w_frame); - win_free(win, NULL); - } -+ #endif - - /* - * Append window "wp" in the window list after window "after". -*** ../vim-8.1.1402/src/popupwin.c 2019-05-26 20:10:02.604276366 +0200 ---- src/popupwin.c 2019-05-26 20:43:32.806147513 +0200 -*************** -*** 30,35 **** ---- 30,36 ---- - wp->w_wincol = dict_get_number(dict, (char_u *)"col"); - wp->w_zindex = dict_get_number(dict, (char_u *)"zindex"); - -+ #if defined(FEAT_TIMERS) - // Add timer to close the popup after some time. - nr = dict_get_number(dict, (char_u *)"time"); - if (nr > 0) -*************** -*** 49,54 **** ---- 50,56 ---- - wp->w_popup_timer->tr_partial = tv.vval.v_partial; - } - } -+ #endif - - } - -*** ../vim-8.1.1402/src/testdir/test_popupwin.vim 2019-05-26 20:10:02.604276366 +0200 ---- src/testdir/test_popupwin.vim 2019-05-26 20:42:03.266599309 +0200 -*************** -*** 39,44 **** ---- 39,47 ---- - endfunc - - func Test_popup_time() -+ if !has('timers') -+ return -+ endif - topleft vnew - call setline(1, 'hello') - -*************** -*** 52,57 **** ---- 55,61 ---- - call assert_equal('world', line) - - sleep 700m -+ redraw - let line = join(map(range(1, 5), 'screenstring(1, v:val)'), '') - call assert_equal('hello', line) - -*** ../vim-8.1.1402/src/version.c 2019-05-26 20:10:02.604276366 +0200 ---- src/version.c 2019-05-26 20:34:08.880951767 +0200 -*************** -*** 769,770 **** ---- 769,772 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 1403, - /**/ - --- -To define recursion, we must first define recursion. - - /// 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 /// |