USER_INITIALS

diff --git a/etc/vim/source/comment.vim b/etc/vim/source/comment.vim
index f95505fa5c1c9839b781cd7c389c23005562c6c8..4a29837c7228e2661be820652222d5c053a86501 100644 (file)
--- a/etc/vim/source/comment.vim
+++ b/etc/vim/source/comment.vim
@@ -5,8 +5,7 @@
 "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 func! CommentMeNow()
-  let user_initials = system('printf "%s" ${USER_INITIALS:-`whoami`}')
-       return $user_initials . ' ' . strftime('%d.%m.%y')
+       return $USER_INITIALS . ' ' . strftime('%d.%m.%y')
 endfunc
 
 func! CommentSubSpecialChar(text)

diff --git a/etc/vim/source/functions.vim b/etc/vim/source/functions.vim
index 2e2b305de199a8acf481c33dacfd5ff33a85c986..b13b4cc987ea4381cf396cc29e0fe1f0a87530be 100644 (file)
--- a/etc/vim/source/functions.vim
+++ b/etc/vim/source/functions.vim
@@ -11,132 +11,20 @@
 let File = { 'type' : '' }
 let $USER_INITIALS = system('printf "%s" ${USER_INITIALS:-`whoami`}')
 
-let $FileInit = ''
-func! FileInit(...)
-
-       " One load per file
-       let CurrentFile = expand('%:p')
-       if $FileInit == CurrentFile
-               return
-       endif
-       let $FileInit = CurrentFile
-       call Debug('FileInit()')
-
-       let bashenv = $BASH_ENV
-       let $BASH_ENV = ""
-
-       let g:File['path'] = expand('%:p')
-       let g:File['ext'] = expand('%:e')
-       let g:File['type'] = &filetype
-
-       " Comment char - NB 20.08.12
-       let g:File['c'] = '#'
-       let g:File['cEnd'] = ''
-       let g:File['me_now'] = $USER_INITIALS . ' ' . strftime('%d.%m.%y')
-
-       if (g:File['type'] == 'vim') || (g:File['type'] == 'vimrc')
-               let g:File['c'] = '"'
-
-       elseif (g:File['type'] == 'javascript' || g:File['type'] == 'c' || g:File['ext'] == 'json')
-               let g:File['c'] = '//'
-
-       elseif (g:File['ext'] == 'lua')
-               let g:File['c'] = '--'
-
-       elseif (g:File['type'] == 'php')
-               let g:File['c'] = '#'
-
-       elseif (g:File['type'] == 'sql')
-               let g:File['c'] = '--'
-
-       elseif (g:File['type'] == 'ini') || (g:File['type'] == 'cfg') || (g:File['type'] == 'bindzone')
-               let g:File['c'] = ';'
-
-       elseif (g:File['type'] == 'xhtml') || (g:File['type'] == 'html') || (g:File['type'] == 'xml')
-               let g:File['c'] = '<!-- '
-               let g:File['cEnd'] = ' -->'
-
-       elseif (g:File['type'] == 'css') || (g:File['ext'] == 'css')
-               let g:File["c"] = "/*\n"
-               let g:File["cEnd"] = "\n*/"
-
-       endif
-
-       " Script valid cmd - NB 20.08.12
-       let g:File['check'] = 'du -sh'
-
-       if (g:File['type'] == 'php')
-               let g:File['check'] = g:mimeCheck['php']
-
-       elseif (g:File['type'] == 'python')
-               let g:File['check'] = g:mimeCheck['python']
-
-       elseif (g:File['type'] == 'perl')
-               let g:File['check'] = g:mimeCheck['perl']
-
-       elseif (g:File['type'] == 'html') || (g:File['type'] == 'xhtml')
-               let g:File['check'] = g:mimeCheck['html']
-
-       elseif (g:File['type'] == 'xml')
-               let g:File['check'] = g:mimeCheck['xml']
-
-       elseif (g:File['type'] == 'javascript' || g:File['ext'] == 'json')
-               let g:File['check'] = "ruby -rjson -e 'puts JSON.parse(File.read(ARGV[0]))'"
-                               if (filereadable('/usr/local/bin/node'))
-                                               let g:File['check'] = "/usr/local/bin/node --check"
-                               end
-
-       elseif (g:File['ext'] == 'erb')
-               let g:File['check'] = g:mimeCheck['erb']
-
-       elseif (g:File['ext'] == 'rb')
-               let g:File['check'] = g:mimeCheck['ruby']
-
-       elseif (g:File['ext'] == 'pp')
-               let g:File['check'] = "perl -e 'system qq/puppet parser validate $ARGV[0] && puppet-lint --no-selector_inside_resource-check --no-autoloader_layout-check --no-hard_tabs-check --no-80chars-check $ARGV[0]/'"
-
-       elseif (g:File['type'] == 'yaml')
-               let g:File['check'] = g:mimeCheck['yaml']
-
-       elseif (g:File['type'] == 'sh')
-               let g:File['check'] = g:mimeCheck['bash']
-
+func! FileCheckSyntaxe()
+       if ( g:mimeCheck->get(&filetype) == '0')
+         let cmd = 'xargs -IZ sh -c "ls -ahl Z" <<<'
        else
-         if (has_key(g:mimeCheck,g:File['ext']))
-                 let g:File['check'] = g:mimeCheck[g:File['ext']]
-         elseif (has_key(g:mimeCheck,g:File['type']))
-                 let g:File['check'] = g:mimeCheck[g:File['type']]
-         endif
+               let cmd = g:mimeCheck->get(&filetype)
        endif
-
-       let $BASH_ENV = bashenv
-       return "g:File: <".string(g:File).">"
-endfunc
-
-func! FileCheck()
-
-       call FileInit()
-
-        if g:File['check'] == ''
-               echo "FileCheck: Unknow file type".g:File['type']
-               return
-       endif
-
-       let cmd = g:File['check'].' '.g:File['path']
+       let cmd = cmd . ' "' .expand('%:p') . '"'
+       echo cmd
        let bashenv = $BASH_ENV
        let $BASH_ENV = ""
        exec '!'.cmd
        let $BASH_ENV = bashenv
-       return cmd
-
 endfunc
 
-function Err(txt)
-  echo 'ERROR: '.a:txt
-  return
-endfunc
-
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 let Debug = $VIMRC_DEBUG
 let DebugMsgs = [ 'Start '.strftime('%F %T') ]
@@ -158,3 +46,9 @@ func! Debug(...)
        return g:Debug
 
 endfunc
+
+function Err(txt)
+  echo 'ERROR: '.a:txt
+  return
+endfunc
+

diff --git a/etc/vim/source/map.vim b/etc/vim/source/map.vim
index c0933de7ec4f3b586b99cf8863aa93e62d94873a..3ede584357dcc0fe4a448d6804b4a2bd99b0f836 100644 (file)
--- a/etc/vim/source/map.vim
+++ b/etc/vim/source/map.vim
@@ -18,6 +18,15 @@
 map <C-n> :bn<C-M>
 map <C-b> :bp<C-M>
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" F1 - Last Cmd
+map <F1> :!<C-UP><C-M>
+map \ex :!<C-UP><C-M>
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" F2 - Script, formated text verification
+map <F2> :call FileCheckSyntaxe()<CR>
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " F5 - Comment
 map <F5> :call CommentNewLine()<CR>

diff --git a/etc/vimrc b/etc/vimrc
index 687aef82543622e12feda52567f2b2ac354aacc6..6e04a49f84509ad37f7b0af45af73f7987e513ee 100644 (file)
--- a/etc/vimrc
+++ b/etc/vimrc
@@ -11,6 +11,6 @@ if &runtimepath !~ $VIMHOME
   let &runtimepath = &runtimepath . ',' . $VIMHOME
 endif
 
-for file in split(globpath($VIMHOME . '/source/', '*.vim'), '\n')
-  execute 'source' fnameescape(file)
+for src in split(globpath($VIMHOME . '/source/', '*.vim'), '\n')
+  execute 'source' fnameescape(src)
 endfor