To: vim-dev@vim.org Subject: Patch 6.1.441 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.441 Problem: "zj" and "zk" cannot be used as a motion command after an operator. (Ralf Hetzel) Solution: Accept these commands as motion commands. Files: src/normal.c *** ../vim61.440/src/normal.c Sun Mar 23 21:06:00 2003 --- src/normal.c Wed Apr 2 21:39:40 2003 *************** *** 339,345 **** {'w', nv_wordcmd, 0, FALSE}, {'x', nv_abbrev, NV_KEEPREG, 0}, {'y', nv_operator, 0, 0}, ! {'z', nv_zet, NV_NCH_NOP, 0}, {'{', nv_findpar, 0, BACKWARD}, {'|', nv_pipe, 0, 0}, {'}', nv_findpar, 0, FORWARD}, --- 339,345 ---- {'w', nv_wordcmd, 0, FALSE}, {'x', nv_abbrev, NV_KEEPREG, 0}, {'y', nv_operator, 0, 0}, ! {'z', nv_zet, NV_NCH_ALW, 0}, {'{', nv_findpar, 0, BACKWARD}, {'|', nv_pipe, 0, 0}, {'}', nv_findpar, 0, FORWARD}, *************** *** 4126,4134 **** if ( #ifdef FEAT_FOLDING /* "zf" and "zF" are always an operator, "zd", "zo", "zO", "zc" ! * and "zC" only in Visual mode. */ cap->nchar != 'f' && cap->nchar != 'F' && !(VIsual_active && vim_strchr((char_u *)"dcCoO", cap->nchar)) && #endif checkclearop(cap->oap)) --- 4137,4147 ---- if ( #ifdef FEAT_FOLDING /* "zf" and "zF" are always an operator, "zd", "zo", "zO", "zc" ! * and "zC" only in Visual mode. "zj" and "zk" are motion ! * commands. */ cap->nchar != 'f' && cap->nchar != 'F' && !(VIsual_active && vim_strchr((char_u *)"dcCoO", cap->nchar)) + && cap->nchar != 'j' && cap->nchar != 'k' && #endif checkclearop(cap->oap)) *** ../vim61.440/src/version.c Sun Apr 6 14:44:53 2003 --- src/version.c Sun Apr 6 14:46:24 2003 *************** *** 613,614 **** --- 613,616 ---- { /* Add new patch number below this line */ + /**/ + 441, /**/ -- Q: What's orange and sounds like a parrot? A: A carrot /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///