To: vim-dev@vim.org Subject: Patch 6.1.127 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.127 Problem: When using "--remote file" and the server has 'insertmode' set, commands are inserted instead of being executed. (Niklas Volbers) Solution: Go to Normal mode again after the ":drop" command. Files: src/main.c *** ../vim61.126/src/main.c Sun Jun 9 20:51:06 2002 --- src/main.c Sat Jul 13 15:29:31 2002 *************** *** 2839,2845 **** ga_concat(&ga, p); vim_free(p); } ! ga_concat(&ga, (char_u *)":cd -"); if (sendReply) ga_concat(&ga, (char_u *)":call SetupRemoteReplies()"); if (inicmd != NULL) --- 2840,2848 ---- ga_concat(&ga, p); vim_free(p); } ! /* The :drop commands goes to Insert mode when 'insertmode' is set, use ! * CTRL-\ CTRL-N again. */ ! ga_concat(&ga, (char_u *)":cd -"); if (sendReply) ga_concat(&ga, (char_u *)":call SetupRemoteReplies()"); if (inicmd != NULL) *************** *** 2847,2854 **** ga_concat(&ga, (char_u *)":"); ga_concat(&ga, inicmd); } ! /* Bring the window to the foreground & clear command line */ ! ga_concat(&ga, (char_u *)":call foreground():"); ga_append(&ga, NUL); return ga.ga_data; } --- 2850,2858 ---- ga_concat(&ga, (char_u *)":"); ga_concat(&ga, inicmd); } ! /* Bring the window to the foreground, goto Insert mode when 'im' set and ! * clear command line */ ! ga_concat(&ga, (char_u *)":call foreground():if &im|starti|endif|echo"); ga_append(&ga, NUL); return ga.ga_data; } *** ../vim61.126/src/version.c Tue Jul 9 21:50:11 2002 --- src/version.c Sat Jul 13 15:30:21 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 127, /**/ -- CART DRIVER: Bring out your dead! LARGE MAN: Here's one! CART DRIVER: Ninepence. BODY: I'm not dead! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///