Version 5.1

  New menu items: 'choose makefile' (\rcm), 'make clean' (\rmc)
  Bugfix: g:Perl_LocalTemplateFile ignored if present
  Bugfix: debugger do not start in console mode

README.perlsupport

@@ -1,4 +1,4 @@
-README for perl-support.vim (Version 5.0.1) / April 21 2012
+README for perl-support.vim (Version 5.1) / May 04 2012
 
   *  INSTALLATION
   *  RELEASE NOTES 
@@ -139,11 +139,11 @@ For a system-wide installation please see the help file 'doc/perlsupport.txt'.
 =======================================================================================
 
 ---------------------------------------------------------------------------------------
-  RELEASE NOTES FOR VERSION 5.0.1
+  RELEASE NOTES FOR VERSION 5.1
 ---------------------------------------------------------------------------------------
-- Bugfix: resolve home for linked home directories
-- Bugfix: ":make" and ":!make" no longer affect each other.
-- Bugfix: S-F1 not working for module list.
+- New menu items: 'choose makefile' (\rcm), 'make clean' (\rmc)
+- Bugfix: g:Perl_LocalTemplateFile ignored if present (thanks to Sébastien Nobili)
+- Bugfix: debugger do not start in console mode
 - Several internal improvements.
 
 ---------------------------------------------------------------------------------------

autoload/mmtemplates/core.vim

@@ -47,6 +47,10 @@ if &cp || ( exists('g:Templates_Version') && ! exists('g:Templates_DevelopmentOv
 	finish
 endif
 let g:Templates_Version= '0.9'     " version number of this script; do not change
+
+if ! exists ( 'g:Templates_MapInUseWarn' )
+	let g:Templates_MapInUseWarn = 1
+endif
 "
 "----------------------------------------------------------------------
 "  === Modul setup. ===   {{{1
@@ -2925,19 +2929,23 @@ function! mmtemplates#core#CreateMaps ( library, localleader, ... )
 		" no map or map already existing?
 		if empty ( mp )
 			continue
-		elseif ! empty ( maparg( leader.mp ) )
-			call s:ErrorMsg ( 'Mapping already in use: "'.leader.mp.'"' )
-			continue
 		endif
-		"
-		" visual mode: template contains a split tag, or the mode is forced
-		if visual == 1 | let v = ',"v"'
-		else           | let v = ''     | endif
-		"
-		" assemble the command to create the maps
-		let cmd .= ' noremap '.options.' '.leader.mp.'      :call mmtemplates#core#InsertTemplate('.a:library.',"'.t_name.'")<CR>'.sep
-		let cmd .= 'inoremap '.options.' '.leader.mp.' <Esc>:call mmtemplates#core#InsertTemplate('.a:library.',"'.t_name.'")<CR>'.sep
-		let cmd .= 'vnoremap '.options.' '.leader.mp.' <Esc>:call mmtemplates#core#InsertTemplate('.a:library.',"'.t_name.'"'.v.')<CR>'.sep
+
+		for mode in ['', 'v', 'i']
+			if ! empty ( maparg( leader.mp, mode ) )
+				if g:Templates_MapInUseWarn != 0
+					call s:ErrorMsg ( 'Mapping already in use: "'.leader.mp.'", mode "'.mode.'"' )
+				endif
+				continue
+			endif
+			"
+			let esc = mode == '' ? '' : '<Esc>'
+			" visual mode: template contains a split tag, or the mode is forced
+			let v = mode == 'v' && visual == 1 ? ',"v"' : ''
+			"
+			" assemble the command to create the maps
+			let cmd .= mode.'noremap '.options.' '.leader.mp.' '.esc.':call mmtemplates#core#InsertTemplate('.a:library.',"'.t_name.'"'.v.')<CR>'.sep
+		endfor
 		"
 	endfor
 	"

perl-support/templates/comments.templates

@@ -27,7 +27,7 @@
 #     SEE ALSO: n/a
 #===============================================================================
 == Comments.file description pl == map:chpl, sc:d, start, noindent ==
-#!/usr/bin/perl 
+#!/usr/bin/env perl 
 #===============================================================================
 #
 #         FILE: |FILENAME|
@@ -49,6 +49,7 @@
 
 use strict;
 use warnings;
+use utf8;
 
 == Comments.file description pm == map:chpm, sc:d, start, noindent ==
 #
@@ -121,14 +122,14 @@ use Test::More tests => 1;                      # last test to print
   'TODO'        : ':TODO      :|DATE| |TIME|:|AUTHORREF|: <CURSOR>',
   'WARNING'     : ':WARNING   :|DATE| |TIME|:|AUTHORREF|: <CURSOR>',
   'WORKAROUND'  : ':WORKAROUND:|DATE| |TIME|:|AUTHORREF|: <CURSOR>',
-	'new keyword' : ':<CURSOR>:|DATE| |TIME|:|AUTHORREF|: {+COMMENT+}',
+  'new keyword' : ':<CURSOR>:|DATE| |TIME|:|AUTHORREF|: {+COMMENT+}',
 == LIST: comments_macros == hash ==
-	'AUTHOR'       : '|AUTHOR|',
-	'AUTHORREF'    : '|AUTHORREF|',
-	'COMPANY'      : '|COMPANY|',
-	'COPYRIGHT'    : '|COPYRIGHT|',
-	'EMAIL'        : '|EMAIL|',
-	'ORGANIZATION' : '|ORGANIZATION|',
+  'AUTHOR'       : '|AUTHOR|',
+  'AUTHORREF'    : '|AUTHORREF|',
+  'COMPANY'      : '|COMPANY|',
+  'COPYRIGHT'    : '|COPYRIGHT|',
+  'EMAIL'        : '|EMAIL|',
+  'ORGANIZATION' : '|ORGANIZATION|',
 == ENDLIST ==
 
 == Comments.keyword comments == expandmenu, append, map:ck, sc:k ==

perl-support/templates/specvar.templates

@@ -2,6 +2,7 @@
 == LIST: basics == hash ==
   '$BASETIME $^T'         : '$BASETIME<CURSOR>',
   '$PERL_VERSION $^V'     : '$PERL_VERSION<CURSOR>',
+  '$EXECUTABLE_NAME $^X'  : '$EXECUTABLE_NAME<CURSOR>',
   '$PROGRAM_NAME $0'      : '$PROGRAM_NAME<CURSOR>',
   '$OSNAME $^O'           : '$OSNAME<CURSOR>',
   '$SYSTEM_FD_MAX $^F'    : '$SYSTEM_FD_MAX<CURSOR>',
@@ -16,31 +17,31 @@
 == ENDTEMPLATE ==
 
 == LIST: errors == hash ==
-	'$CHILD_ERROR $?'       : '$CHILD_ERROR',
-	'$ERRNO $!'             : '$ERRNO{<CURSOR>}',
-	'$EVAL_ERROR $@'        : '$EVAL_ERROR',
-	'$EXTENDED_OS_ERROR $^E': '$EXTENDED_OS_ERROR',
-	'$WARNING $^W'          : '$WARNING',
+  '$CHILD_ERROR $?'       : '$CHILD_ERROR',
+  '$ERRNO $!'             : '$ERRNO{<CURSOR>}',
+  '$EVAL_ERROR $@'        : '$EVAL_ERROR',
+  '$EXTENDED_OS_ERROR $^E': '$EXTENDED_OS_ERROR',
+  '$WARNING $^W'          : '$WARNING',
 == ENDLIST ==
 
 == Special Variables.errors == expandmenu, insert, sc:e, map:ve ==
 |PickList( 'errors', 'errors' )|
 |PICK|<CURSOR>
 == ENDTEMPLATE ==
 
-== LIST: files == hash ==
+== LIST: filehandle == hash ==
   '$AUTOFLUSH $\|'                   : '$AUTOFLUSH',
   '$FORMAT_LINES_LEFT $-'            : '$FORMAT_LINES_LEFT',
   '$FORMAT_LINES_PER_PAGE $='        : '$FORMAT_LINES_PER_PAGE',
-  '$FORMAT_LINE_BREAK_CHARACTER $:'  : '$FORMAT_LINES_PER_PAGE',
+  '$FORMAT_LINE_BREAK_CHARACTER $:'  : '$FORMAT_LINE_BREAK_CHARACTER',
   '$FORMAT_NAME $~'                  : '$FORMAT_NAME',
   '$FORMAT_PAGE_NUMBER $%'           : '$FORMAT_PAGE_NUMBER',
   '$FORMAT_TOP_NAME $^'              : '$FORMAT_TOP_NAME',
   '$OUTPUT_AUTOFLUSH $\|'            : '$OUTPUT_AUTOFLUSH',
 == ENDLIST ==
 
-== Special Variables.files == expandmenu, insert, sc:f, map:vf ==
-|PickList( 'files', 'files' )|
+== Special Variables.filehandle == expandmenu, insert, sc:f, map:vf ==
+|PickList( 'filehandle', 'filehandle' )|
 |PICK|<CURSOR>
 == ENDTEMPLATE ==
 
@@ -86,9 +87,9 @@
   '$MATCH $&'                      : '$MATCH',
   '$POSTMATCH $'''                 : '$POSTMATCH',
   '$PREMATCH $`'                   : '$PREMATCH',
-  '@LAST_MATCH_END @+'             : '@LAST_MATCH_END',
-  '@LAST_MATCH_START @-'           : '@LAST_MATCH_START',
-  '$LAST_PAREN_MATCH $+'           : '$LAST_PAREN_MATCH{<CURSOR>}',
+  '$LAST_MATCH_START $-'           : '$LAST_MATCH_START',
+  '$LAST_MATCH_END $+'             : '$LAST_MATCH_END',
+  '$LAST_PAREN_MATCH $+'           : '$LAST_PAREN_MATCH',
   '$LAST_SUBMATCH_RESULT $^N'      : '$LAST_SUBMATCH_RESULT',
   '$LAST_REGEXP_CODE_RESULT $^R'   : '$LAST_REGEXP_CODE_RESULT',
 == ENDLIST ==
@@ -99,25 +100,34 @@
 == ENDTEMPLATE ==
 
 == LIST: POSIX_signals == list ==
-  'HUP',
-  'INT',
-  'QUIT',
-  'ILL',
   'ABRT',
-  'FPE',
-  'KILL',
-  'SEGV',
-  'PIPE',
   'ALRM',
-  'TERM',
-  'USR1',
-  'USR2',
+  'BUS',
   'CHLD',
   'CONT',
+  'FPE',
+  'HUP',
+  'ILL',
+  'INT',
+  'KILL',
+  'PIPE',
+  'POLL',
+  'PROF',
+  'QUIT',
+  'SEGV',
   'STOP',
+  'SYS',
+  'TERM',
+  'TRAP',
   'TSTP',
   'TTIN',
   'TTOU',
+  'URG',
+  'USR1',
+  'USR2',
+  'VTALRM',
+  'XCPU',
+  'XFSZ',
 == ENDLIST ==
 
 == Special Variables.POSIX signals == expandmenu, insert, sc:p, map:vs ==