On Wed, Feb 15, 2012 at 10:54 PM, Bram Moolenaar <[email protected]> wrote: > Please try the patch below. I currently do not have a Windows machine > to try this out.
I feel like an idiot, but I cannot get the patch to apply cleanly; and importing into mq just says the patch is empty! Can someone see what I'm doing wrong? I admit I've only successfully used the command-line patch tool once or twice ever in the past. F:\Documents\Ben\vim>patch --version patch 2.5.9 Copyright (C) 1988 Larry Wall Copyright (C) 2003 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. For more information about these matters, see the file named COPYING. written by Larry Wall and Paul Eggert F:\Documents\Ben\vim>patch -i ..\vim-patches\bram_bad_shellxquote.diff -p2 missing header for context diff at line 3 of patch patching file src/misc2.c Hunk #1 FAILED at 3230. 1 out of 1 hunk FAILED -- saving rejects to file src/misc2.c.rej missing header for context diff at line 26 of patch patching file src/option.c Hunk #1 FAILED at 3935. 1 out of 1 hunk FAILED -- saving rejects to file src/option.c.rej missing header for context diff at line 61 of patch patching file src/os_win32.c Hunk #1 FAILED at 3908. Hunk #2 FAILED at 3958. 2 out of 2 hunks FAILED -- saving rejects to file src/os_win32.c.rej F:\Documents\Ben\vim>hg revert --all reverting src\misc2.c reverting src\option.c reverting src\os_win32.c F:\Documents\Ben\vim>patch -i ..\vim-patches\bram_bad_shellxquote.diff -p1 can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |*** ../vim-7.3.444/src/misc2.c 2012-01-20 17:15:47.000000000 +0100 |--- src/misc2.c 2012-02-16 05:34:37.000000000 +0100 -------------------------- File to patch: F:\Documents\Ben\vim>REM convert to unix format in gvim... F:\Documents\Ben\vim>patch -i ..\vim-patches\bram_bad_shellxquote.diff -p2 patch: **** malformed patch at line 12: 3240 ---- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php
