*** ../vim-7.2.350/getchar.c	Thu Jan 28 06:36:36 2010
--- src/getchar.c	Thu Jan 28 06:48:26 2010
***************
*** 2495,2507 ****
  			    i = ins_typebuf(s,
  				    save_m_noremap != REMAP_YES
  					    ? save_m_noremap
- 					    : STRNCMP(s,
  #ifdef FEAT_EVAL
  					   save_m_keys != NULL ? save_m_keys :
- #endif
  						      mp->m_keys,
  							  (size_t)keylen) != 0
  						     ? REMAP_YES : REMAP_SKIP,
  				0, TRUE, cmd_silent || save_m_silent);
  #ifdef FEAT_EVAL
  			    if (save_m_expr)
--- 2495,2512 ----
  			    i = ins_typebuf(s,
  				    save_m_noremap != REMAP_YES
  					    ? save_m_noremap
  #ifdef FEAT_EVAL
+ 					    : STRNCMP(s,
  					   save_m_keys != NULL ? save_m_keys :
  						      mp->m_keys,
  							  (size_t)keylen) != 0
  						     ? REMAP_YES : REMAP_SKIP,
+ #else
+ 					    : STRNCMP(s,
+ 						      mp->m_keys,
+ 							  (size_t)keylen) != 0
+ 						     ? REMAP_YES : REMAP_SKIP,
+ #endif
  				0, TRUE, cmd_silent || save_m_silent);
  #ifdef FEAT_EVAL
  			    if (save_m_expr)