To: vim_dev@googlegroups.com Subject: Patch 8.2.3431 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3431 Problem: Completion for :disas sorts local functions first. Solution: Sort local functions last, like with :delfunc. (Naohiro Ono, closes #8860) Files: src/cmdexpand.c, src/testdir/test_cmdline.vim *** ../vim-8.2.3430/src/cmdexpand.c 2021-09-01 13:03:31.422768900 +0200 --- src/cmdexpand.c 2021-09-12 13:50:39.833604762 +0200 *************** *** 2262,2268 **** { if (xp->xp_context == EXPAND_EXPRESSION || xp->xp_context == EXPAND_FUNCTIONS ! || xp->xp_context == EXPAND_USER_FUNC) // functions should be sorted to the end. qsort((void *)*file, (size_t)*num_file, sizeof(char_u *), sort_func_compare); --- 2262,2269 ---- { if (xp->xp_context == EXPAND_EXPRESSION || xp->xp_context == EXPAND_FUNCTIONS ! || xp->xp_context == EXPAND_USER_FUNC ! || xp->xp_context == EXPAND_DISASSEMBLE) // functions should be sorted to the end. qsort((void *)*file, (size_t)*num_file, sizeof(char_u *), sort_func_compare); *** ../vim-8.2.3430/src/testdir/test_cmdline.vim 2021-09-08 14:29:43.117509762 +0200 --- src/testdir/test_cmdline.vim 2021-09-12 13:50:39.837604753 +0200 *************** *** 854,859 **** --- 854,864 ---- call feedkeys(":disas s:WeirdF\\\"\", 'xt') call assert_match('"disas \d\+_WeirdFunc', @:) + call feedkeys(":disas \\\"\", 'xt') + call assert_match('"disas \d\+_', @:) + call feedkeys(":disas debug \\\"\", 'xt') + call assert_match('"disas debug \d\+_', @:) + " completion for the :match command call feedkeys(":match Search /pat/\\\"\", 'xt') call assert_equal("\"match Search /pat/\", @:) *** ../vim-8.2.3430/src/version.c 2021-09-12 13:39:04.327467410 +0200 --- src/version.c 2021-09-12 13:52:20.925388698 +0200 *************** *** 757,758 **** --- 757,760 ---- { /* Add new patch number below this line */ + /**/ + 3431, /**/ -- If they don't keep on exercising their lips, he thought, their brains start working. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// 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 ///