[Vim-latex-cvs] vimfiles/ftplugin/latex-suite envmacros.vim,1.42,1.43

[<sri...@us...>]

Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite
In directory sc8-pr-cvs1:/tmp/cvs-serv24908

Modified Files:
	envmacros.vim 
Log Message:
Bug: EEA inserted something different than "eqnarray<F5>".
Why: Tex_EnvMacros() used its own logic for forming the environment string.
Fix: make Tex_EnvMacros() call Tex_PutEnvironment() instead.


Index: envmacros.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/envmacros.vim,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** envmacros.vim	23 Dec 2003 21:08:42 -0000	1.42
--- envmacros.vim	23 Dec 2003 21:26:50 -0000	1.43
***************
*** 72,76 ****
  
  		if g:Tex_EnvironmentMaps && !exists('s:doneOnce')
! 			call IMAP (a:lhs, '\begin{'.a:name."}\<CR>".extra."<++>\<CR>\\end{".a:name."}<++>", 'tex')
  			exec 'vnoremap <silent> '.vlhs.' '.vrhs
  		endif
--- 72,77 ----
  
  		if g:Tex_EnvironmentMaps && !exists('s:doneOnce')
! 			" call IMAP (a:lhs, '\begin{'.a:name."}\<CR>".extra."<++>\<CR>\\end{".a:name."}<++>", 'tex')
! 			call IMAP(a:lhs, "\<C-r>=Tex_PutEnvironment('".a:name."')\<CR>", 'tex')
  			exec 'vnoremap <silent> '.vlhs.' '.vrhs
  		endif
***************
*** 417,421 ****
  			let label = input('Label?  ')
  			if label != ''
! 				let arrlabel = '\label{'.label."}\<cr> "
  			  else
  				let arrlabel = ''
--- 418,422 ----
  			let label = input('Label?  ')
  			if label != ''
! 				let arrlabel = '\label{'.label."}\<cr>"
  			  else
  				let arrlabel = ''
***************
*** 424,436 ****
  			let arrlabel = ''
  		endif
- 		return IMAP_PutTextWithMovement('\begin{'.a:env."}\<cr>".arrlabel."<++>\<cr>\\end{".a:env."}<++>")
  	else
  		if a:env !~ '\*'
! 			let arrlabel = '\label{<++>}<++>'
  		else
! 			let arrlabel = '<++>'
  		endif
- 		return IMAP_PutTextWithMovement('\begin{'.a:env."}\<cr>".arrlabel."\<cr>".'\end{'.a:env.'}<++>')
  	endif
  endfunction
  " }}} 
--- 425,436 ----
  			let arrlabel = ''
  		endif
  	else
  		if a:env !~ '\*'
! 			let arrlabel = "\\label{<++>}\<cr>"
  		else
! 			let arrlabel = ""
  		endif
  	endif
+ 	return IMAP_PutTextWithMovement('\begin{'.a:env."}\<cr><++>\<cr>".arrlabel."\\end{".a:env."}<++>")
  endfunction
  " }}}