On 28/12/08 06:28, harpchad wrote:
> This patch does not apply cleanly due to the Id string. When building
> using the 7.2 extra tar distribution (ftp://ftp.vim.org/pub/vim/extra/
> vim-7.2-extra.tar.gz) the Id string is:
>
> * $Id: if_sniff.c,v 1.4 2006/03/06 23:13:51 vimboss Exp $
>
> which corresponds to 7.2.000.
>
> It looks like the Id update was left out of the 7.2.041 patch, causing
> (the first hunk of) this patch to fail. Perhaps the first hunk could
> be removed and clean up in the next code release?
Find (attached) a "doctored" version of the patch, which will apply
cleanly. I think this was what Bram meant.
Best regards,
Tony.
--
[clop clop]
ARTHUR: Old woman!
DENNIS: Man!
ARTHUR: Man, sorry. What knight lives in that castle over there?
DENNIS: I'm thirty seven.
ARTHUR: What?
DENNIS: I'm thirty seven -- I'm not old!
The Quest for the Holy Grail (Monty
Python)
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
To: [email protected]
Subject: Patch 7.2.072 (extra)
Fcc: outbox
From: Bram Moolenaar <[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.072 (extra)
Problem: Compiler warning in Sniff code.
Solution: Use return value of pipe(). (Dominique Pelle)
Files: src/if_sniff.c
*** ../vim-7.2.071/src/if_sniff.c Sat Nov 15 14:11:10 2008
--- src/if_sniff.c Sat Dec 6 14:01:57 2008
***************
*** 2,9 ****
*
* if_sniff.c Interface between Vim and SNiFF+
*
- * $Id: if_sniff.c,v 1.4 2006/03/06 23:13:51 vimboss Exp $
- *
* See README.txt for an overview of the Vim source code.
*/
--- 2,7 ----
***************
*** 716,723 ****
#else /* UNIX Version of the Code */
int ToSniffEmacs[2], FromSniffEmacs[2];
! pipe(ToSniffEmacs);
! pipe(FromSniffEmacs);
/* fork */
if ((sniffemacs_pid=fork()) == 0)
--- 714,723 ----
#else /* UNIX Version of the Code */
int ToSniffEmacs[2], FromSniffEmacs[2];
! if (pipe(ToSniffEmacs) != 0)
! return 1;
! if (pipe(FromSniffEmacs) != 0)
! return 1;
/* fork */
if ((sniffemacs_pid=fork()) == 0)
*** ../vim-7.2.071/src/version.c Wed Dec 24 12:20:10 2008
--- src/version.c Wed Dec 24 12:42:13 2008
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 72,
/**/
--
SIGIRO -- irony detected (iron core dumped)
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
