To: vim_dev@googlegroups.com Subject: Patch 9.0.1453 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1453 Problem: Typos in source code and tests. Solution: Fi the typos. (Dominique Pellé, closes #12217) Files: src/feature.h, src/gui_haiku.cc, src/if_ole.cpp, src/logfile.c, src/os_mac.h, src/structs.h, src/termdefs.h, src/testdir/test_menu.vim, src/testdir/test_mswin_event.vim, src/testdir/test_textprop.vim *** ../vim-9.0.1452/src/feature.h 2023-02-05 18:00:38.353400148 +0000 --- src/feature.h 2023-04-14 21:45:25.008001985 +0100 *************** *** 823,832 **** * +mouse_gpm Unix only: Include code for Linux console mouse * handling. * +mouse_pterm PTerm mouse support for QNX ! * +mouse_sgr Unix only: Include code for for SGR-styled mouse. * +mouse_sysmouse Unix only: Include code for FreeBSD and DragonFly * console mouse handling. ! * +mouse_urxvt Unix only: Include code for for urxvt mouse handling. * +mouse Any mouse support (any of the above enabled). * Always included, since either FEAT_MOUSE_XTERM or * DOS_MOUSE is defined. --- 823,832 ---- * +mouse_gpm Unix only: Include code for Linux console mouse * handling. * +mouse_pterm PTerm mouse support for QNX ! * +mouse_sgr Unix only: Include code for SGR-styled mouse. * +mouse_sysmouse Unix only: Include code for FreeBSD and DragonFly * console mouse handling. ! * +mouse_urxvt Unix only: Include code for urxvt mouse handling. * +mouse Any mouse support (any of the above enabled). * Always included, since either FEAT_MOUSE_XTERM or * DOS_MOUSE is defined. *** ../vim-9.0.1452/src/gui_haiku.cc 2022-08-14 14:16:07.991582244 +0100 --- src/gui_haiku.cc 2023-04-14 21:45:25.012001986 +0100 *************** *** 4518,4524 **** // when we add a BMenu to another Menu, it creates the interconnecting BMenuItem tmp->AddItem(bmenu); ! // Now its safe to query the menu for the associated MenuItem.... menu->id = tmp->FindItem((const char *) menu->dname); } --- 4518,4524 ---- // when we add a BMenu to another Menu, it creates the interconnecting BMenuItem tmp->AddItem(bmenu); ! // Now it's safe to query the menu for the associated MenuItem... menu->id = tmp->FindItem((const char *) menu->dname); } *** ../vim-9.0.1452/src/if_ole.cpp 2022-10-01 19:43:48.606494048 +0100 --- src/if_ole.cpp 2023-04-14 21:45:25.012001986 +0100 *************** *** 334,340 **** /* Reject strings too long to fit in the input buffer. Allow 10 bytes * space to cover for the (remote) possibility that characters may enter * the input buffer between now and when the WM_OLE message is actually ! * processed. If more that 10 characters enter the input buffer in that * time, the WM_OLE processing will simply fail to insert the characters. */ if ((int)(STRLEN(str)) > (vim_free_in_input_buf() - 10)) --- 334,340 ---- /* Reject strings too long to fit in the input buffer. Allow 10 bytes * space to cover for the (remote) possibility that characters may enter * the input buffer between now and when the WM_OLE message is actually ! * processed. If more than 10 characters enter the input buffer in that * time, the WM_OLE processing will simply fail to insert the characters. */ if ((int)(STRLEN(str)) > (vim_free_in_input_buf() - 10)) *** ../vim-9.0.1452/src/logfile.c 2022-12-01 11:02:19.288680405 +0000 --- src/logfile.c 2023-02-18 12:28:36.323119487 +0000 *************** *** 9,15 **** /* * Implements logging. Originally intended for the channel feature, which is * why the "ch_" prefix is used. Also useful for any kind of low-level and ! * async debuging. */ #include "vim.h" --- 9,15 ---- /* * Implements logging. Originally intended for the channel feature, which is * why the "ch_" prefix is used. Also useful for any kind of low-level and ! * async debugging. */ #include "vim.h" *** ../vim-9.0.1452/src/os_mac.h 2023-02-28 15:51:20.366861331 +0000 --- src/os_mac.h 2023-04-14 21:45:31.476000761 +0100 *************** *** 28,34 **** */ #if defined(__APPLE_CC__) // for Project Builder and ... # include ! // Get stat.h or something similar. Comment: How come some OS get in in vim.h # include // && defined(HAVE_CURSE) // The curses.h from MacOS X provides by default some BACKWARD compatibility --- 28,34 ---- */ #if defined(__APPLE_CC__) // for Project Builder and ... # include ! // Get stat.h or something similar. Comment: How come some OS get in vim.h # include // && defined(HAVE_CURSE) // The curses.h from MacOS X provides by default some BACKWARD compatibility *** ../vim-9.0.1452/src/structs.h 2023-04-13 22:12:46.304718945 +0100 --- src/structs.h 2023-04-14 21:45:31.480000761 +0100 *************** *** 1993,1999 **** /* * Info about an encountered script. ! * When sn_state has the SN_STATE_NOT_LOADED is has not been sourced yet. */ typedef struct { --- 1993,1999 ---- /* * Info about an encountered script. ! * When sn_state has SN_STATE_NOT_LOADED, it has not been sourced yet. */ typedef struct { *************** *** 4780,4786 **** int cts_text_prop_count; // number of text props; when zero // cts_text_props is not used textprop_T *cts_text_props; // text props (allocated) ! char cts_has_prop_with_text; // TRUE if if a property inserts text int cts_cur_text_width; // width of current inserted text int cts_prop_lines; // nr of properties above or below int cts_first_char; // width text props above the line --- 4780,4786 ---- int cts_text_prop_count; // number of text props; when zero // cts_text_props is not used textprop_T *cts_text_props; // text props (allocated) ! char cts_has_prop_with_text; // TRUE if a property inserts text int cts_cur_text_width; // width of current inserted text int cts_prop_lines; // nr of properties above or below int cts_first_char; // width text props above the line *** ../vim-9.0.1452/src/termdefs.h 2023-01-10 12:37:33.253580676 +0000 --- src/termdefs.h 2023-04-14 21:45:31.480000761 +0100 *************** *** 14,21 **** #if defined(SASC) && SASC < 658 /* ! * The SAS C compiler has a bug that makes typedefs being forgot in include ! * files. Has been fixed in version 6.58. */ typedef unsigned char char_u; #endif --- 14,21 ---- #if defined(SASC) && SASC < 658 /* ! * The SAS C compiler has a bug that makes typedefs being forgotten ! * in include files. Has been fixed in version 6.58. */ typedef unsigned char char_u; #endif *** ../vim-9.0.1452/src/testdir/test_menu.vim 2022-12-17 10:40:07.171464572 +0000 --- src/testdir/test_menu.vim 2023-04-14 21:47:52.027975867 +0100 *************** *** 162,168 **** " Test for menu item completion in command line func Test_menu_expand() ! " Create the menu itmes for test menu Dummy.Nothing lll for i in range(1, 4) let m = 'menu Xmenu.A' .. i .. '.A' .. i --- 162,168 ---- " Test for menu item completion in command line func Test_menu_expand() ! " Create the menu items for test menu Dummy.Nothing lll for i in range(1, 4) let m = 'menu Xmenu.A' .. i .. '.A' .. i *** ../vim-9.0.1452/src/testdir/test_mswin_event.vim 2023-01-28 19:18:56.729720605 +0000 --- src/testdir/test_mswin_event.vim 2023-02-18 12:30:45.303100888 +0000 *************** *** 6,12 **** source mouse.vim " Helper function for sending a grouped sequence of low level key presses ! " The modifer key(s) can be included as VK Key Codes in the sequence " Keydown events will be sent, to to the end of the group, then keyup events " will be sent in reverse order to release the keys. func SendKeyGroup(keygroup) --- 6,12 ---- source mouse.vim " Helper function for sending a grouped sequence of low level key presses ! " The modifier key(s) can be included as VK Key Codes in the sequence " Keydown events will be sent, to to the end of the group, then keyup events " will be sent in reverse order to release the keys. func SendKeyGroup(keygroup) *************** *** 19,25 **** endfunc " Send individual key press and release events. ! " the modifers for the key press can be specified in the modifiers arg. func SendKeyWithModifiers(key, modifiers) let args = { } let args.keycode = a:key --- 19,25 ---- endfunc " Send individual key press and release events. ! " the modifiers for the key press can be specified in the modifiers arg. func SendKeyWithModifiers(key, modifiers) let args = { } let args.keycode = a:key *************** *** 359,365 **** " and when the virtual termcap maps the character call assert_equal(0, mod_mask, $"key = {kstr}") ! " Send as a single key press with a modifers mask. let modifiers = 0 let key = kcodes[0] for key in kcodes --- 359,365 ---- " and when the virtual termcap maps the character call assert_equal(0, mod_mask, $"key = {kstr}") ! " Send as a single key press with a modifiers mask. let modifiers = 0 let key = kcodes[0] for key in kcodes *** ../vim-9.0.1452/src/testdir/test_textprop.vim 2023-02-19 18:36:24.723281718 +0000 --- src/testdir/test_textprop.vim 2023-04-14 21:45:36.791999766 +0100 *************** *** 1570,1576 **** call prop_add(2, 7, {'length': 2, 'type': 'number'}) call prop_add(3, 6, {'length': 2, 'type': 'number'}) call prop_add(4, 7, {'length': 2, 'type': 'number'}) ! " The highlighted "is" in line 1, 2 and 4 is kept and ajudsted. " The highlighted "is" in line 3 is deleted. let expected = [ \ #{type_bufnr: 0, id: 0, col: 6, end: 1, type: 'number', length: 2, start: 1}, --- 1570,1576 ---- call prop_add(2, 7, {'length': 2, 'type': 'number'}) call prop_add(3, 6, {'length': 2, 'type': 'number'}) call prop_add(4, 7, {'length': 2, 'type': 'number'}) ! " The highlighted "is" in line 1, 2 and 4 is kept and adjusted. " The highlighted "is" in line 3 is deleted. let expected = [ \ #{type_bufnr: 0, id: 0, col: 6, end: 1, type: 'number', length: 2, start: 1}, *** ../vim-9.0.1452/src/version.c 2023-04-13 22:12:46.304718945 +0100 --- src/version.c 2023-04-14 20:13:53.042737486 +0100 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1453, /**/ -- Veni, Vidi, VW -- I came, I saw, I drove around in a little car. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///