To: vim_dev@googlegroups.com Subject: Patch 8.0.1845 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1845 Problem: Various comment updates needed, missing white space. Solution: Update comments, add white space. Files: src/getchar.c, src/testdir/test_cscope.vim, src/gui_mac.c *** ../vim-8.0.1844/src/getchar.c 2018-05-12 21:34:54.643882495 +0200 --- src/getchar.c 2018-05-13 18:25:53.410035653 +0200 *************** *** 4399,4405 **** /* * Check for an abbreviation. ! * Cursor is at ptr[col]. When inserting, mincol is where insert started. * "c" is the character typed before check_abbr was called. It may have * ABBR_OFF added to avoid prepending a CTRL-V to it. * --- 4399,4407 ---- /* * Check for an abbreviation. ! * Cursor is at ptr[col]. ! * When inserting, mincol is where insert started. ! * For the command line, mincol is what is to be skipped over. * "c" is the character typed before check_abbr was called. It may have * ABBR_OFF added to avoid prepending a CTRL-V to it. * *** ../vim-8.0.1844/src/testdir/test_cscope.vim 2017-03-18 20:18:42.063950224 +0100 --- src/testdir/test_cscope.vim 2018-04-05 19:04:00.912249683 +0200 *************** *** 36,42 **** " Test 1: Find this C-Symbol for cmd in ['cs find s main', 'cs find 0 main'] ! let a=execute(cmd) " Test 1.1 test where it moves the cursor call assert_equal('main(void)', getline('.')) " Test 1.2 test the output of the :cs command --- 36,42 ---- " Test 1: Find this C-Symbol for cmd in ['cs find s main', 'cs find 0 main'] ! let a = execute(cmd) " Test 1.1 test where it moves the cursor call assert_equal('main(void)', getline('.')) " Test 1.2 test the output of the :cs command *************** *** 51,71 **** " Test 3: Find functions called by this function for cmd in ['cs find d test_mf_hash', 'cs find 2 test_mf_hash'] ! let a=execute(cmd) call assert_match('\n(1 of 42): <> mf_hash_init(&ht);', a) call assert_equal(' mf_hash_init(&ht);', getline('.')) endfor " Test 4: Find functions calling this function for cmd in ['cs find c test_mf_hash', 'cs find 3 test_mf_hash'] ! let a=execute(cmd) call assert_match('\n(1 of 1): <
> test_mf_hash();', a) call assert_equal(' test_mf_hash();', getline('.')) endfor " Test 5: Find this text string for cmd in ['cs find t Bram', 'cs find 4 Bram'] ! let a=execute(cmd) call assert_match('(1 of 1): <<>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a) call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.')) endfor --- 51,71 ---- " Test 3: Find functions called by this function for cmd in ['cs find d test_mf_hash', 'cs find 2 test_mf_hash'] ! let a = execute(cmd) call assert_match('\n(1 of 42): <> mf_hash_init(&ht);', a) call assert_equal(' mf_hash_init(&ht);', getline('.')) endfor " Test 4: Find functions calling this function for cmd in ['cs find c test_mf_hash', 'cs find 3 test_mf_hash'] ! let a = execute(cmd) call assert_match('\n(1 of 1): <
> test_mf_hash();', a) call assert_equal(' test_mf_hash();', getline('.')) endfor " Test 5: Find this text string for cmd in ['cs find t Bram', 'cs find 4 Bram'] ! let a = execute(cmd) call assert_match('(1 of 1): <<>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a) call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.')) endfor *************** *** 73,79 **** " Test 6: Find this egrep pattern " test all matches returned by cscope for cmd in ['cs find e ^\#includ.', 'cs find 6 ^\#includ.'] ! let a=execute(cmd) call assert_match('\n(1 of 3): <<>> #include ', a) call assert_equal('#include ', getline('.')) cnext --- 73,79 ---- " Test 6: Find this egrep pattern " test all matches returned by cscope for cmd in ['cs find e ^\#includ.', 'cs find 6 ^\#includ.'] ! let a = execute(cmd) call assert_match('\n(1 of 3): <<>> #include ', a) call assert_equal('#include ', getline('.')) cnext *************** *** 84,90 **** endfor " Test 7: Find the same egrep pattern using lcscope this time. ! let a=execute('lcs find e ^\#includ.') call assert_match('\n(1 of 3): <<>> #include ', a) call assert_equal('#include ', getline('.')) lnext --- 84,90 ---- endfor " Test 7: Find the same egrep pattern using lcscope this time. ! let a = execute('lcs find e ^\#includ.') call assert_match('\n(1 of 3): <<>> #include ', a) call assert_equal('#include ', getline('.')) lnext *************** *** 96,102 **** " Test 8: Find this file for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] enew ! let a=execute(cmd) call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C') call assert_equal('Xmemfile_test.c', @%) endfor --- 96,102 ---- " Test 8: Find this file for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] enew ! let a = execute(cmd) call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C') call assert_equal('Xmemfile_test.c', @%) endfor *************** *** 104,110 **** " Test 9: Find files #including this file for cmd in ['cs find i assert.h', 'cs find 8 assert.h'] enew ! let a=execute(cmd) let alines = split(a, '\n', 1) call assert_equal('', alines[0]) call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+C') --- 104,110 ---- " Test 9: Find files #including this file for cmd in ['cs find i assert.h', 'cs find 8 assert.h'] enew ! let a = execute(cmd) let alines = split(a, '\n', 1) call assert_equal('', alines[0]) call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+C') *************** *** 118,128 **** " Test 11: Find places where this symbol is assigned a value " this needs a cscope >= 15.8 " unfortunately, Travis has cscope version 15.7 ! let cscope_version=systemlist('cscope --version')[0] ! let cs_version=str2float(matchstr(cscope_version, '\d\+\(\.\d\+\)\?')) if cs_version >= 15.8 for cmd in ['cs find a item', 'cs find 9 item'] ! let a=execute(cmd) call assert_equal(['', '(1 of 4): <> item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);'], split(a, '\n', 1)) call assert_equal(' item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);', getline('.')) cnext --- 118,128 ---- " Test 11: Find places where this symbol is assigned a value " this needs a cscope >= 15.8 " unfortunately, Travis has cscope version 15.7 ! let cscope_version = systemlist('cscope --version')[0] ! let cs_version = str2float(matchstr(cscope_version, '\d\+\(\.\d\+\)\?')) if cs_version >= 15.8 for cmd in ['cs find a item', 'cs find 9 item'] ! let a = execute(cmd) call assert_equal(['', '(1 of 4): <> item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);'], split(a, '\n', 1)) call assert_equal(' item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);', getline('.')) cnext *************** *** 135,152 **** endif " Test 12: leading whitespace is not removed for cscope find text ! let a=execute('cscope find t test_mf_hash') call assert_equal(['', '(1 of 1): <<>> test_mf_hash();'], split(a, '\n', 1)) call assert_equal(' test_mf_hash();', getline('.')) " Test 13: test with scscope ! let a=execute('scs find t Bram') call assert_match('(1 of 1): <<>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a) call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.')) " Test 14: cscope help for cmd in ['cs', 'cs help', 'cs xxx'] ! let a=execute(cmd) call assert_match('^cscope commands:\n', a) call assert_match('\nadd :', a) call assert_match('\nfind :', a) --- 135,152 ---- endif " Test 12: leading whitespace is not removed for cscope find text ! let a = execute('cscope find t test_mf_hash') call assert_equal(['', '(1 of 1): <<>> test_mf_hash();'], split(a, '\n', 1)) call assert_equal(' test_mf_hash();', getline('.')) " Test 13: test with scscope ! let a = execute('scs find t Bram') call assert_match('(1 of 1): <<>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a) call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.')) " Test 14: cscope help for cmd in ['cs', 'cs help', 'cs xxx'] ! let a = execute(cmd) call assert_match('^cscope commands:\n', a) call assert_match('\nadd :', a) call assert_match('\nfind :', a) *************** *** 155,179 **** call assert_match('\nreset: Reinit all connections', a) call assert_match('\nshow : Show connections', a) endfor ! let a=execute('scscope help') call assert_match('This cscope command does not support splitting the window\.', a) " Test 15: reset connections ! let a=execute('cscope reset') call assert_match('\nAdded cscope database.*Xcscope.out (#0)', a) call assert_match('\nAll cscope databases reset', a) " Test 16: cscope show ! let a=execute('cscope show') call assert_match('\n 0 \d\+.*Xcscope.out\s*', a) " Test 17: cstag and 'csto' option set csto=0 ! let a=execute('cstag TEST_COUNT') call assert_match('(1 of 1): <> #define TEST_COUNT 50000', a) call assert_equal('#define TEST_COUNT 50000', getline('.')) set csto=1 ! let a=execute('cstag index_to_key') call assert_match('(1 of 1): <> #define index_to_key(i) ((i) ^ 15167)', a) call assert_equal('#define index_to_key(i) ((i) ^ 15167)', getline('.')) call assert_fails('cstag xxx', 'E257:') --- 155,179 ---- call assert_match('\nreset: Reinit all connections', a) call assert_match('\nshow : Show connections', a) endfor ! let a = execute('scscope help') call assert_match('This cscope command does not support splitting the window\.', a) " Test 15: reset connections ! let a = execute('cscope reset') call assert_match('\nAdded cscope database.*Xcscope.out (#0)', a) call assert_match('\nAll cscope databases reset', a) " Test 16: cscope show ! let a = execute('cscope show') call assert_match('\n 0 \d\+.*Xcscope.out\s*', a) " Test 17: cstag and 'csto' option set csto=0 ! let a = execute('cstag TEST_COUNT') call assert_match('(1 of 1): <> #define TEST_COUNT 50000', a) call assert_equal('#define TEST_COUNT 50000', getline('.')) set csto=1 ! let a = execute('cstag index_to_key') call assert_match('(1 of 1): <> #define index_to_key(i) ((i) ^ 15167)', a) call assert_equal('#define index_to_key(i) ((i) ^ 15167)', getline('.')) call assert_fails('cstag xxx', 'E257:') *************** *** 183,192 **** set nocst call assert_fails('tag TEST_COUNT', 'E426:') set cst ! let a=execute('tag TEST_COUNT') call assert_match('(1 of 1): <> #define TEST_COUNT 50000', a) call assert_equal('#define TEST_COUNT 50000', getline('.')) ! let a=execute('tags') call assert_match('1 1 TEST_COUNT\s\+\d\+\s\+#define index_to_key', a) " Test 19: this should trigger call to cs_print_tags() --- 183,192 ---- set nocst call assert_fails('tag TEST_COUNT', 'E426:') set cst ! let a = execute('tag TEST_COUNT') call assert_match('(1 of 1): <> #define TEST_COUNT 50000', a) call assert_equal('#define TEST_COUNT 50000', getline('.')) ! let a = execute('tags') call assert_match('1 1 TEST_COUNT\s\+\d\+\s\+#define index_to_key', a) " Test 19: this should trigger call to cs_print_tags() *************** *** 198,214 **** call assert_fails('cscope kill 2', 'E261:') call assert_fails('cscope kill xxx', 'E261:') ! let a=execute('cscope kill 0') call assert_match('cscope connection 0 closed', a) cscope add Xcscope.out ! let a=execute('cscope kill Xcscope.out') call assert_match('cscope connection Xcscope.out closed', a) cscope add Xcscope.out . ! let a=execute('cscope kill -1') call assert_match('cscope connection .*Xcscope.out closed', a) ! let a=execute('cscope kill -1') call assert_equal('', a) " Test 21: 'csprg' option --- 198,214 ---- call assert_fails('cscope kill 2', 'E261:') call assert_fails('cscope kill xxx', 'E261:') ! let a = execute('cscope kill 0') call assert_match('cscope connection 0 closed', a) cscope add Xcscope.out ! let a = execute('cscope kill Xcscope.out') call assert_match('cscope connection Xcscope.out closed', a) cscope add Xcscope.out . ! let a = execute('cscope kill -1') call assert_match('cscope connection .*Xcscope.out closed', a) ! let a = execute('cscope kill -1') call assert_equal('', a) " Test 21: 'csprg' option *************** *** 220,226 **** " Test 22: multiple cscope connections cscope add Xcscope.out cscope add Xcscope2.out . -C ! let a=execute('cscope show') call assert_match('\n 0 \d\+.*Xcscope.out\s*', a) call assert_match('\n 1 \d\+.*Xcscope2.out\s*\.', a) --- 220,226 ---- " Test 22: multiple cscope connections cscope add Xcscope.out cscope add Xcscope2.out . -C ! let a = execute('cscope show') call assert_match('\n 0 \d\+.*Xcscope.out\s*', a) call assert_match('\n 1 \d\+.*Xcscope2.out\s*\.', a) *************** *** 271,277 **** call assert_equal(cscope_connection(), 0) call assert_fails('cscope find s main', 'E567:') ! let a=execute('cscope show') call assert_match('no cscope connections', a) endfunc --- 271,277 ---- call assert_equal(cscope_connection(), 0) call assert_fails('cscope find s main', 'E567:') ! let a = execute('cscope show') call assert_match('no cscope connections', a) endfunc *** ../vim-8.0.1844/src/gui_mac.c 2018-03-04 18:07:04.264592373 +0100 --- src/gui_mac.c 2018-03-06 18:53:06.156032091 +0100 *************** *** 61,73 **** # define USE_CARBONKEYHANDLER static int im_is_active = FALSE; ! #if 0 /* TODO: Implement me! */ static int im_start_row = 0; static int im_start_col = 0; ! #endif ! #define NR_ELEMS(x) (sizeof(x) / sizeof(x[0])) static TSMDocumentID gTSMDocument; --- 61,73 ---- # define USE_CARBONKEYHANDLER static int im_is_active = FALSE; ! # if 0 /* TODO: Implement me! */ static int im_start_row = 0; static int im_start_col = 0; ! # endif ! # define NR_ELEMS(x) (sizeof(x) / sizeof(x[0])) static TSMDocumentID gTSMDocument; *************** *** 6243,6253 **** void im_set_position(int row, int col) { ! #if 0 /* TODO: Implement me! */ im_start_row = row; im_start_col = col; ! #endif } static ScriptLanguageRecord gTSLWindow; --- 6243,6253 ---- void im_set_position(int row, int col) { ! # if 0 /* TODO: Implement me! */ im_start_row = row; im_start_col = col; ! # endif } static ScriptLanguageRecord gTSLWindow; *** ../vim-8.0.1844/src/version.c 2018-05-15 21:56:11.148208421 +0200 --- src/version.c 2018-05-15 22:23:19.283247717 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1845, /**/ -- Females are strictly forbidden to appear unshaven in public. [real standing law in New Mexico, United States of America] /// 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 ///