To: vim-dev@vim.org
Subject: Patch 7.2b.012
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2b.012
Problem:    Build failure with +multi_byte but without +diff.
Solution:   Add #ifdef. (Patrick Texier)
Files:	    src/main.c


*** ../vim-7.2b.011/src/main.c	Sun Jul 13 19:15:12 2008
--- src/main.c	Thu Jul 24 10:40:56 2008
***************
*** 2245,2251 ****
  		/* Remember this argument has been added to the argument list.
  		 * Needed when 'encoding' is changed. */
  		used_file_arg(argv[0], parmp->literal, parmp->full_path,
! 							    parmp->diff_mode);
  	    }
  #endif
  	}
--- 2245,2256 ----
  		/* Remember this argument has been added to the argument list.
  		 * Needed when 'encoding' is changed. */
  		used_file_arg(argv[0], parmp->literal, parmp->full_path,
! # ifdef FEAT_DIFF
! 							    parmp->diff_mode
! # else
! 							    FALSE
! # endif
! 							    );
  	    }
  #endif
  	}
*** ../vim-7.2b.011/src/version.c	Thu Jul 24 13:20:13 2008
--- src/version.c	Thu Jul 24 13:49:35 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     12,
  /**/

-- 
FATHER:    Did you kill all those guards?
LAUNCELOT: Yes ...  I'm very sorry ...
FATHER:    They cost fifty pounds each!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- 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    ///