To: vim_dev@googlegroups.com
Subject: Patch 7.3.733
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
 
Patch 7.3.733
Problem:    Tests fail when including MzScheme.
Solution:   Change #ifdefs for vim_main2().
Files:	    src/main.c
 
 
*** ../vim-7.3.732/src/main.c	2012-04-25 18:24:24.000000000 +0200
--- src/main.c	2012-11-24 14:26:56.000000000 +0100
***************
*** 147,154 ****
  #define ME_INVALID_ARG		5
  };
  
- #ifndef NO_VIM_MAIN	/* skip this for unittests */
  #ifndef PROTO		/* don't want a prototype for main() */
      int
  # ifdef VIMDLL
  _export
--- 147,154 ----
  #define ME_INVALID_ARG		5
  };
  
  #ifndef PROTO		/* don't want a prototype for main() */
+ #ifndef NO_VIM_MAIN	/* skip this for unittests */
      int
  # ifdef VIMDLL
  _export
***************
*** 570,584 ****
  	return mzscheme_main(2, args);
      }
  }
  
! int vim_main2(int argc, char **argv)
  {
      char_u	*fname = (char_u *)argv[0];
      mparm_T	params;
  
      memcpy(&params, argv[1], sizeof(params));
  #endif
  
      /* Execute --cmd arguments. */
      exe_pre_commands(&params);
  
--- 570,596 ----
  	return mzscheme_main(2, args);
      }
  }
+ #endif
+ #endif /* NO_VIM_MAIN */
  
! /* vim_main2() needs to be produced when FEAT_MZSCHEME is defined even when
!  * NO_VIM_MAIN is defined. */
! #ifdef FEAT_MZSCHEME
!     int
! vim_main2(int argc UNUSED, char **argv UNUSED)
  {
+ # ifndef NO_VIM_MAIN
      char_u	*fname = (char_u *)argv[0];
      mparm_T	params;
  
      memcpy(&params, argv[1], sizeof(params));
+ # else
+     return 0;
+ }
+ # endif
  #endif
  
+ #ifndef NO_VIM_MAIN
      /* Execute --cmd arguments. */
      exe_pre_commands(&params);
  
***************
*** 999,1006 ****
  
      return 0;
  }
- #endif /* PROTO */
  #endif /* NO_VIM_MAIN */
  
  /*
   * Main loop: Execute Normal mode commands until exiting Vim.
--- 1011,1018 ----
  
      return 0;
  }
  #endif /* NO_VIM_MAIN */
+ #endif /* PROTO */
  
  /*
   * Main loop: Execute Normal mode commands until exiting Vim.
*** ../vim-7.3.732/src/version.c	2012-11-28 15:37:46.000000000 +0100
--- src/version.c	2012-11-28 15:54:07.000000000 +0100
***************
*** 727,728 ****
--- 727,730 ----
  {   /* Add new patch number below this line */
+ /**/
+     733,
  /**/
 
-- 
From "know your smileys":
 :^[/   mean-smiley-with-cigarette
 
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///