diff --git a/vim-addon-manager-known-repositories-addon-info.txt b/addon-info.json similarity index 53% rename from vim-addon-manager-known-repositories-addon-info.txt rename to addon-info.json index 8bb9d0b..0bd9439 100644 --- a/vim-addon-manager-known-repositories-addon-info.txt +++ b/addon-info.json @@ -1,9 +1,9 @@ { - "name" : "vim-addon-manager-known-repositories", - "version" : "0.0", + "name" : "vim-pi", + "version" : "undefined", "author" : "Marc Weber ", "maintainer" : "Marc Weber ", - "repository" : {"type": "git", "url": "git://github.com/MarcWeber/vim-addon-manager-known-repositories.git"}, + "repository" : {"type": "git", "url": "https://bitbucket.org/vimcommunity/vim-pi"}, "dependencies" : {}, "description" : "this repository contains a list of known other repositories only" } diff --git a/autoload/vam_known_repositories.vim b/autoload/vam_known_repositories.vim index 9bea525..ffcd4a5 100644 --- a/autoload/vam_known_repositories.vim +++ b/autoload/vam_known_repositories.vim @@ -11,8 +11,8 @@ let s:c['MergeSources']=get(g:vim_addon_manager, 'MergeSources', 'vam_known_repo " If you have custom packages overwrite this function and patch whatever you " want to patch... " -" arg www_vim_org: See vamkr#www_vim_org_generated#Sources() (result is patched vamkr#patch#Patch) -" arg scm_plugin_sources: See vamkr#scm#Sources() (vim_script_nr_X is replaced by plugin's name in keys) +" arg www_vim_org: See vimpi#www_vim_org_generated#Sources() (result is patched vamkr#patch#Patch) +" arg scm_plugin_sources: See vimpi#scm#Sources() (vim_script_nr_X is replaced by plugin's name in keys) fun! vam_known_repositories#MergeSources(plugin_sources, www_vim_org, scm_plugin_sources, patch_function, snr_to_name) let merge_strategy = get(s:c, 'scm_merge_strategy', 'force') @@ -49,16 +49,16 @@ endf " Its the default implementation for the one function returning the pool of " known addons. fun! vam_known_repositories#Pool() - let www_vim_org = vamkr#LoadDBFile('vimorgsources.json') - let snr_to_name = vamkr#GetNrToNameMap(www_vim_org) - let scm = vamkr#GetSCMSources(snr_to_name, www_vim_org) + let www_vim_org = vimpi#LoadDBFile('vimorgsources.json') + let snr_to_name = vimpi#GetNrToNameMap(www_vim_org) + let scm = vimpi#GetSCMSources(snr_to_name, www_vim_org) " start from scratch adding plugin sources to pool: let pool = copy(get(s:c, 'plugin_sources', {})) " now call MergeSources merge function so that user can pick scm over " www_vim_org sources as she desires. - call call(s:c['MergeSources'], [pool, www_vim_org, scm, 'vamkr#PatchSources', snr_to_name], {}) + call call(s:c['MergeSources'], [pool, www_vim_org, scm, 'vimpi#PatchSources', snr_to_name], {}) return pool endf diff --git a/autoload/vamkr.vim b/autoload/vamkr.vim index 82ac9d3..e54a78e 100644 --- a/autoload/vamkr.vim +++ b/autoload/vamkr.vim @@ -1,147 +1,17 @@ -if exists('g:vam_kr_running_hook_test') - function s:Log(message) - throw a:message - endfunction -elseif exists('g:vam_kr_silent') - function! s:Log(message) - endfunction -else - let s:Log=function('vam#Log') -endif - -if !exists('g:vam_kr_database_directory') - let s:dbdir = expand(':h:h').'/db' -else - let s:dbdir = g:vam_kr_database_directory -endif - -function! vamkr#LoadDBFile(file) abort - let ext=fnamemodify(a:file, ':e') - let file=s:dbdir.'/'.a:file - if ext is# 'vim' - " The following code executes content of a .vim file returning the r var - " which should be defined. Its similar to using autoload functions. - " However autoload functions would not be garbage collected. Whether its - " insane to think about this small details - I don't know. Its ZyX idea - " and gets the job done. Little bit uncommon :) - " - " limitations: You can’t use line continuation here - execute "function! s:Vim()\n".join(readfile(file, 'b'), "\n")."\nreturn r\nendfunction" - try - let r=s:Vim() - catch /.*/ - throw "error: ".v:exception.' real error location ('.a:file.'): '.v:throwpoint - endtry - delfunction s:Vim - return r - elseif ext is# 'json' - try - return eval(join(readfile(file, 'b'), '')) - catch /.*/ - throw 'Failed to read json file “'.file.'”: '.v:exception.' '.v:throwpoint - endtry - else - throw 'Unknown file type: '.ext - endif -endfunction - -function! vamkr#SuggestNewName(name) - let messages = [] - for [nr, names] in items(vamkr#LoadDBFile('script-id-to-name-log.json')) - if index(names, a:name) > 0 - call add(messages, a:name." was renamed to ".names[0]) - endif - endfor - return messages -endfunction - -function! s:FilterConflicts(from, with, bang) - let r=[] - call filter(a:from, a:bang.'has_key(a:with, v:key) ? 1 : [0, add(r, v:key)][0]') - return r -endfunction - -function! vamkr#GetSCMSources(snr_to_name, www_vim_org) - let [scm, scmnr]=vamkr#LoadDBFile('scmsources.vim') - let scmnr_generated=vamkr#LoadDBFile('scm_generated.json') - call extend(scmnr, scmnr_generated, 'keep') - let scmvoconflicts=s:FilterConflicts(scm, a:www_vim_org, '!') - if !empty(scmvoconflicts) - call s:Log('The following scm keys are the same as vim.org ones: '.join(scmvoconflicts, ', ').".\n". - \'These plugins should either be renamed or put into scmnr dictionary.') - endif - let missingscmnr=s:FilterConflicts(scmnr, a:snr_to_name, '') - if !empty(missingscmnr) - call s:Log('The following scmnr keys are not known: '.join(missingscmnr, ', ').'.') +runtime autoload/vimpi.vim + +redir => s:funcs +" Do not make it indent: use :execute to hide :function +silent execute 'function /^vimpi#' +redir END + +for s:fname in map(split(s:funcs, "\n"), 'matchstr(v:val, ''\v%(vimpi#)@<=[^(]*'')') + if !empty(s:fname) + execute "function vamkr#".s:fname."(...)" + \."\n echohl WarningMsg" + \."\n echomsg 'Function vamkr#".s:fname." is deprecated, use vimpi#".s:fname."'" + \."\n echohl None" + \."\n return call('vimpi#".s:fname."', a:000)" + \."\nendfunction" endif - " Merge scmnr sources into scm, rewriting numbers as names. But first add - " vim_script_nr key so that AddonInfo still finds the plugin even if scm - " overwrites www_vim_org sources - call map(scmnr, 'extend(scm, {a:snr_to_name[v:key] : extend(v:val, {"vim_script_nr": v:key})})') - unlet scmnr - " Transform names like %{snr} in dependencies dictionary into names used by - " VAM - for repository in filter(values(scm), 'has_key(v:val, "addon-info") && has_key(v:val["addon-info"], "dependencies")') - let depdict=repository['addon-info'].dependencies - for depname in filter(keys(depdict), 'v:val[0] is# "%"') - call remove(depdict, depname) - let depdict[a:snr_to_name[depname[1:]]]={} - endfor - endfor - return scm -endfunction - -function! vamkr#PatchSources(sources, snr_to_name) - let [patch_repo, addon_info, addon_info_deps, renamings]=vamkr#LoadDBFile('patchinfo.vim') - " short documentation see patchinfo.vim - - for [snr, deps] in items(addon_info_deps) - if !has_key(addon_info, snr) - let addon_info[snr]={} - endif - let ms = addon_info[snr] - let ms.dependencies = get(addon_info, 'dependencies', {}) - call map(deps, 'extend( ms.dependencies, {(type(v:val) == type(0) ? a:snr_to_name[v:val] : v:val) : {}})') - endfor - call filter(addon_info, 'has_key(a:snr_to_name, v:key)') - call map(addon_info, 'extend(patch_repo, {v:key : extend(get(patch_repo, v:key, {}), {"addon-info": v:val})})') - let add_by_name={} - call map(patch_repo, 'extend(add_by_name, {a:snr_to_name[v:key] : v:val})') - call map(filter(add_by_name, 'has_key(a:sources, v:key)'), 'extend(a:sources[v:key], v:val)') - - for [from, to_] in items(renamings) - if has_key(a:sources, to_) | throw "cannot rename ".from.' to '.to_ | endif - let a:sources[to_] = a:sources[from] - call remove(a:sources, from) - let a:sources[to_].old_title = from - unlet from to_ - endfor - - return a:sources -endfunction - -function! vamkr#AddCopyHook(repository, files) - let hook=[] - let dirs={} - for [file, dir] in items(a:files) - let dirs[dir]=1 - " Assuming that no one is crazy enough to really have newlines in - " filename - let hook+=['call vam#utils#CopyFile(%d.'.string('/'.file).', %d.'.string('/'.dir.'/'.file).')'] - endfor - let a:repository['addon-info']={} - let a:repository['addon-info']['post-install-hook']=join(map(keys(dirs), '"call mkdir(%d.".string("/".v:val).(stridx(v:val, "/")==-1 ? "" : ", ''p''").")"')+hook, ' | ') - let a:repository['addon-info']['post-scms-update-hook']=join(hook, ' | ') - return a:repository " Make it possible to use let scmnr.XXXX = vamkr#AddCopyHook({...}, {...}) -endfunction - -function! vamkr#GetNrToNameMap(www_vim_org) - " build vim_script_nr to name lookup dictionary: - " nr_to_name is not exposed to the user (can only be accessed via function - " arg) because running #Pool() is expensive. That's why its done only when - " installing or upgrading plugins .. - let snr_to_name={} - call map(copy(a:www_vim_org), 'extend(snr_to_name, {v:val.vim_script_nr : v:key})') - return snr_to_name -endfunction -" vim: ft=vim ts=4 sts=4 sw=4 et fmr=▶,▲ +endfor diff --git a/autoload/vimpi.vim b/autoload/vimpi.vim new file mode 100644 index 0000000..7f2217d --- /dev/null +++ b/autoload/vimpi.vim @@ -0,0 +1,147 @@ +if exists('g:vim_pi_running_hook_test') + function s:Log(message) + throw a:message + endfunction +elseif exists('g:vim_pi_silent') + function! s:Log(message) + endfunction +else + let s:Log=function('vam#Log') +endif + +if !exists('g:vim_pi_database_directory') + let s:dbdir = expand(':h:h').'/db' +else + let s:dbdir = g:vim_pi_database_directory +endif + +function! vimpi#LoadDBFile(file) abort + let ext=fnamemodify(a:file, ':e') + let file=s:dbdir.'/'.a:file + if ext is# 'vim' + " The following code executes content of a .vim file returning the r var + " which should be defined. Its similar to using autoload functions. + " However autoload functions would not be garbage collected. Whether its + " insane to think about this small details - I don't know. Its ZyX idea + " and gets the job done. Little bit uncommon :) + " + " limitations: You can’t use line continuation here + execute "function! s:Vim()\n".join(readfile(file, 'b'), "\n")."\nreturn r\nendfunction" + try + let r=s:Vim() + catch /.*/ + throw "error: ".v:exception.' real error location ('.a:file.'): '.v:throwpoint + endtry + delfunction s:Vim + return r + elseif ext is# 'json' + try + return eval(join(readfile(file, 'b'), '')) + catch /.*/ + throw 'Failed to read json file “'.file.'”: '.v:exception.' '.v:throwpoint + endtry + else + throw 'Unknown file type: '.ext + endif +endfunction + +function! vimpi#SuggestNewName(name) + let messages = [] + for [nr, names] in items(vimpi#LoadDBFile('script-id-to-name-log.json')) + if index(names, a:name) > 0 + call add(messages, a:name." was renamed to ".names[0]) + endif + endfor + return messages +endfunction + +function! s:FilterConflicts(from, with, bang) + let r=[] + call filter(a:from, a:bang.'has_key(a:with, v:key) ? 1 : [0, add(r, v:key)][0]') + return r +endfunction + +function! vimpi#GetSCMSources(snr_to_name, www_vim_org) + let [scm, scmnr]=vimpi#LoadDBFile('scmsources.vim') + let scmnr_generated=vimpi#LoadDBFile('scm_generated.json') + call extend(scmnr, scmnr_generated, 'keep') + let scmvoconflicts=s:FilterConflicts(scm, a:www_vim_org, '!') + if !empty(scmvoconflicts) + call s:Log('The following scm keys are the same as vim.org ones: '.join(scmvoconflicts, ', ').".\n". + \'These plugins should either be renamed or put into scmnr dictionary.') + endif + let missingscmnr=s:FilterConflicts(scmnr, a:snr_to_name, '') + if !empty(missingscmnr) + call s:Log('The following scmnr keys are not known: '.join(missingscmnr, ', ').'.') + endif + " Merge scmnr sources into scm, rewriting numbers as names. But first add + " vim_script_nr key so that AddonInfo still finds the plugin even if scm + " overwrites www_vim_org sources + call map(scmnr, 'extend(scm, {a:snr_to_name[v:key] : extend(v:val, {"vim_script_nr": v:key})})') + unlet scmnr + " Transform names like %{snr} in dependencies dictionary into names used by + " VAM + for repository in filter(values(scm), 'has_key(v:val, "addon-info") && has_key(v:val["addon-info"], "dependencies")') + let depdict=repository['addon-info'].dependencies + for depname in filter(keys(depdict), 'v:val[0] is# "%"') + call remove(depdict, depname) + let depdict[a:snr_to_name[depname[1:]]]={} + endfor + endfor + return scm +endfunction + +function! vimpi#PatchSources(sources, snr_to_name) + let [patch_repo, addon_info, addon_info_deps, renamings]=vimpi#LoadDBFile('patchinfo.vim') + " short documentation see patchinfo.vim + + for [snr, deps] in items(addon_info_deps) + if !has_key(addon_info, snr) + let addon_info[snr]={} + endif + let ms = addon_info[snr] + let ms.dependencies = get(addon_info, 'dependencies', {}) + call map(deps, 'extend( ms.dependencies, {(type(v:val) == type(0) ? a:snr_to_name[v:val] : v:val) : {}})') + endfor + call filter(addon_info, 'has_key(a:snr_to_name, v:key)') + call map(addon_info, 'extend(patch_repo, {v:key : extend(get(patch_repo, v:key, {}), {"addon-info": v:val})})') + let add_by_name={} + call map(patch_repo, 'extend(add_by_name, {a:snr_to_name[v:key] : v:val})') + call map(filter(add_by_name, 'has_key(a:sources, v:key)'), 'extend(a:sources[v:key], v:val)') + + for [from, to_] in items(renamings) + if has_key(a:sources, to_) | throw "cannot rename ".from.' to '.to_ | endif + let a:sources[to_] = a:sources[from] + call remove(a:sources, from) + let a:sources[to_].old_title = from + unlet from to_ + endfor + + return a:sources +endfunction + +function! vimpi#AddCopyHook(repository, files) + let hook=[] + let dirs={} + for [file, dir] in items(a:files) + let dirs[dir]=1 + " Assuming that no one is crazy enough to really have newlines in + " filename + let hook+=['call vam#utils#CopyFile(%d.'.string('/'.file).', %d.'.string('/'.dir.'/'.file).')'] + endfor + let a:repository['addon-info']={} + let a:repository['addon-info']['post-install-hook']=join(map(keys(dirs), '"call mkdir(%d.".string("/".v:val).(stridx(v:val, "/")==-1 ? "" : ", ''p''").")"')+hook, ' | ') + let a:repository['addon-info']['post-scms-update-hook']=join(hook, ' | ') + return a:repository " Make it possible to use let scmnr.XXXX = vimpi#AddCopyHook({...}, {...}) +endfunction + +function! vimpi#GetNrToNameMap(www_vim_org) + " build vim_script_nr to name lookup dictionary: + " nr_to_name is not exposed to the user (can only be accessed via function + " arg) because running #Pool() is expensive. That's why its done only when + " installing or upgrading plugins .. + let snr_to_name={} + call map(copy(a:www_vim_org), 'extend(snr_to_name, {v:val.vim_script_nr : v:key})') + return snr_to_name +endfunction +" vim: ft=vim ts=4 sts=4 sw=4 et fmr=▶,▲ diff --git a/db/patchinfo.vim b/db/patchinfo.vim index f223773..ddaac22 100644 --- a/db/patchinfo.vim +++ b/db/patchinfo.vim @@ -1,7 +1,7 @@ " This file is the "patch" to modify the repository informations retrieved " from vim.sf.net " Most numbers represent vim-script numbers -" See vamkr#PatchSources +" See vimpi#PatchSources let patch_repo = {} let addon_info = {} let addon_info_deps = {} diff --git a/db/scmsources.vim b/db/scmsources.vim index 54bf73c..f32045d 100644 --- a/db/scmsources.vim +++ b/db/scmsources.vim @@ -38,7 +38,7 @@ " this information to be inaccurate. " " Copy Hooks: -" See samples using vamkr#AddCopyHook below, mind the dashes line +" See samples using vimpi#AddCopyHook below, mind the dashes line " " NOTE: Before the first line go authors having at least one SCM source without " any hooks that is also present on vim.org. @@ -193,7 +193,7 @@ let scmnr.1939 = {'type': 'svn', 'url': 'http://vim-soko.googlecode.com/svn/trun let scmnr.2193 = {'type': 'svn', 'url': 'http://vim-soko.googlecode.com/svn/trunk/fpdf-vim'} let scmnr.4585 = {'type': 'git', 'url': 'git://github.com/ynkdir/vim-bgimg'} " The following is not a vim plugin, but it is posted on vim.org: -let scmnr.4258 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://gist.github.com/3848180'}, {'sha3.vim': 'autoload'}) +let scmnr.4258 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://gist.github.com/3848180'}, {'sha3.vim': 'autoload'}) " The following plugin does not have a separate repository: let scmnr.2972 = {'url': 'https://github.com/ynkdir/vim-funlib/raw/master/autoload/hmac.vim', 'archive_name': 'hmac.vim', 'type': 'archive', 'script-type': 'utility'} let scm['vim-patch'] = {'type': 'git', 'url': 'git://github.com/ynkdir/vim-patch'} @@ -322,7 +322,7 @@ let scm['windowlayout'] = {'type': 'git', 'url': 'git://github.com/godlygeek/win let scmnr.2416 = {'type': 'git', 'url': 'git://github.com/nono/jquery.vim'} let scmnr.2417 = {'type': 'git', 'url': 'git://github.com/nono/merb.vim'} " This should possibly be named github_theme@nono -let scm['github_vim_theme'] = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/nono/github_vim_theme'}, {'github.vim': 'colors'}) +let scm['github_vim_theme'] = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/nono/github_vim_theme'}, {'github.vim': 'colors'}) " Anthony Panozzo let scmnr.2429 = {'type': 'git', 'url': 'git://github.com/panozzaj/vim-autocorrect'} @@ -412,7 +412,7 @@ let scmnr.2992 = {'type': 'git', 'url': 'git://github.com/chrisbra/SaveSigns.vim let scmnr.3963 = {'type': 'git', 'url': 'git://github.com/chrisbra/color_highlight'} let scmnr.3965 = {'type': 'git', 'url': 'git://github.com/chrisbra/DynamicSigns'} let scmnr.4357 = {'type': 'git', 'url': 'git://github.com/chrisbra/DistractFree'} -let scmnr.2998 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/chrisbra/BackgroundColor.vim'}, {'backgroundColor.vim': 'plugin'}) +let scmnr.2998 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/chrisbra/BackgroundColor.vim'}, {'backgroundColor.vim': 'plugin'}) " lilydjwg " The following is not a vim plugin, but it is posted on vim.org: @@ -431,7 +431,7 @@ let scmnr.2958 = {'type': 'git', 'url': 'git://github.com/c9s/emoticon.vim'} " Duplicate let scmnr.2959 = {'type': 'git', 'url': 'git://github.com/c9s/emoticon.vim'} let scmnr.3544 = {'type': 'git', 'url': 'git://github.com/c9s/cascading.vim'} -let scmnr.3005 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/c9s/simple-commenter.vim'}, {'simplecommenter.vim': 'plugin'}) +let scmnr.3005 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/c9s/simple-commenter.vim'}, {'simplecommenter.vim': 'plugin'}) let scm['vim-dev-plugin'] = {'type': 'git', 'url': 'git://github.com/c9s/vim-dev-plugin'} let scm['jifty'] = {'type': 'git', 'url': 'git://github.com/c9s/jifty.vim'} " The following repositories are referenced on vim.org, but not present on github: @@ -598,7 +598,7 @@ let scm['correr'] = {'type': 'git', 'url': 'git://github.com/ujihisa/correr'} let scm['unite-help'] = {'type': 'git', 'url': 'git://github.com/tsukkee/unite-help', 'addon-info': {'dependencies': {'%3396': {}}}} let scm['ref-hoogle'] = {'type': 'git', 'url': 'git://github.com/ujihisa/ref-hoogle'} let scm['vimshell-repl'] = {'type': 'git', 'url': 'git://github.com/ujihisa/vimshell-repl'} -let scm['kami'] = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/ujihisa/vim-kami'}, {'kami.vim': 'ftplugin'}) +let scm['kami'] = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/ujihisa/vim-kami'}, {'kami.vim': 'ftplugin'}) " Jose Elera Campana let scmnr.3427 = {'type': 'git', 'url': 'git://github.com/jelera/vim-nazca-colorscheme'} @@ -967,143 +967,143 @@ let scmnr.2616 = {'url': 'https://github.com/graywh/dotfiles/raw/master/.vim/col let scmnr.4017 = {'type': 'git', 'url': 'git://github.com/maksimr/vim-jsbeautify', 'addon-info': {'post-install-hook': 'execute "lcd" fnameescape(%d) | call vam#utils#RunShell("git submodule init && git submodule update") | lcd -', 'post-scms-update': 'execute "lcd" fnameescape(%d) | call vam#utils#RunShell("git submodule update") | lcd -'}} " Michael Brown -let scmnr.2780 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/mjbrownie/Python-Tag-Import'}, {'python_tag_import.vim': 'ftplugin'}) -let scmnr.2781 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/mjbrownie/django_helper.vim'}, {'django_helper.vim': 'plugin'}) +let scmnr.2780 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/mjbrownie/Python-Tag-Import'}, {'python_tag_import.vim': 'ftplugin'}) +let scmnr.2781 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/mjbrownie/django_helper.vim'}, {'django_helper.vim': 'plugin'}) " Peter Odding -let scmnr.3242 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/xolox/vim-open-associated-programs'}, {'open.vim': 'autoload/xolox'}) +let scmnr.3242 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/xolox/vim-open-associated-programs'}, {'open.vim': 'autoload/xolox'}) " Andrei Nicholson -let scmnr.2548 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/tetsuo13/Vim-PHP-Doc'}, {'php.vim': 'after/syntax'}) +let scmnr.2548 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/tetsuo13/Vim-PHP-Doc'}, {'php.vim': 'after/syntax'}) " Paul Lampert -let scmnr.4736 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/lampert/vim'}, {'navigate-softtab.vim': 'plugin'}) +let scmnr.4736 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/lampert/vim'}, {'navigate-softtab.vim': 'plugin'}) " jeb beich -let scmnr.4648 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/jebberjeb/yet-another-buffer-list'}, {'buflist.vim': 'plugin'}) +let scmnr.4648 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/jebberjeb/yet-another-buffer-list'}, {'buflist.vim': 'plugin'}) " Robert Mitchell -let scmnr.4526 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/robu3/vimongous'}, {'vimongous.vim': 'plugin', 'venode.js': 'plugin', 'venode-lib.js': 'plugin'}) +let scmnr.4526 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/robu3/vimongous'}, {'vimongous.vim': 'plugin', 'venode.js': 'plugin', 'venode-lib.js': 'plugin'}) " Hugo Wang -let scmnr.4512 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/mitnk/thwins'}, {'thwins.vim': 'plugin'}) +let scmnr.4512 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/mitnk/thwins'}, {'thwins.vim': 'plugin'}) " Felipe Tanus -let scmnr.4420 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/fotanus/fold_license'}, {'fold_license.vim': 'plugin'}) +let scmnr.4420 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/fotanus/fold_license'}, {'fold_license.vim': 'plugin'}) " felippe alves -let scmnr.4413 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/flipgthb/misc'}, {'darkgit.vim': 'colors'}) +let scmnr.4413 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/flipgthb/misc'}, {'darkgit.vim': 'colors'}) " Yu-Heng Chang -let scmnr.4417 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/changyuheng/holokai'}, {'holokai.vim': 'colors'}) +let scmnr.4417 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/changyuheng/holokai'}, {'holokai.vim': 'colors'}) " Long Changjin -let scmnr.4332 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/wusuopu/weibo-vim-plugin'}, {'my_weibo.vim': 'plugin'}) +let scmnr.4332 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/wusuopu/weibo-vim-plugin'}, {'my_weibo.vim': 'plugin'}) " sunus lee -let scmnr.4307 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/sunuslee/vim-plugin-show-git-log'}, {'showgitlog.vim': 'plugin'}) -let scmnr.4319 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/sunuslee/vim-plugin-random-colorscheme-picker'}, {'randomColorPicker.vim': 'colors'}) +let scmnr.4307 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/sunuslee/vim-plugin-show-git-log'}, {'showgitlog.vim': 'plugin'}) +let scmnr.4319 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/sunuslee/vim-plugin-random-colorscheme-picker'}, {'randomColorPicker.vim': 'colors'}) " Guodong Liang -let scmnr.4299 = vamkr#AddCopyHook({'type': 'svn', 'url': 'http://name5566-vim-bookmark.googlecode.com/svn/trunk/'}, {'vbookmark.vim': 'plugin'}) +let scmnr.4299 = vimpi#AddCopyHook({'type': 'svn', 'url': 'http://name5566-vim-bookmark.googlecode.com/svn/trunk/'}, {'vbookmark.vim': 'plugin'}) " Basil Gor -let scmnr.4263 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/basilgor/vim-autotags'}, {'autotags.vim': 'plugin'}) +let scmnr.4263 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/basilgor/vim-autotags'}, {'autotags.vim': 'plugin'}) " Baptiste Fontaine -let scmnr.4181 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/bfontaine/omgrofl.vim'}, {'omgrofl.vim': 'syntax'}) -let scmnr.4507 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/bfontaine/conflicts.vim'}, {'conflicts.vim': 'syntax'}) +let scmnr.4181 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/bfontaine/omgrofl.vim'}, {'omgrofl.vim': 'syntax'}) +let scmnr.4507 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/bfontaine/conflicts.vim'}, {'conflicts.vim': 'syntax'}) " Shuhei Kubota -let scmnr.1283 = vamkr#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/tinybufferexplorer'}, {'tbe.vim': 'plugin'}) -let scmnr.1477 = vamkr#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/modeliner'}, {'modeliner.vim': 'plugin'}) -let scmnr.2205 = vamkr#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/coremosearch'}, {'coremo_search.vim': 'plugin'}) -let scmnr.2496 = vamkr#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/changed'}, {'changed.vim': 'plugin'}) -let scmnr.2542 = vamkr#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/starrange'}, {'starrange.vim': 'plugin'}) -let scmnr.2843 = vamkr#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/fliplr'}, {'fliplr.vim': 'plugin'}) -let scmnr.3162 = vamkr#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/tabops'}, {'tabops.vim': 'plugin'}) -let scmnr.3640 = vamkr#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/theoldones'}, {'theoldones.vim': 'plugin'}) +let scmnr.1283 = vimpi#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/tinybufferexplorer'}, {'tbe.vim': 'plugin'}) +let scmnr.1477 = vimpi#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/modeliner'}, {'modeliner.vim': 'plugin'}) +let scmnr.2205 = vimpi#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/coremosearch'}, {'coremo_search.vim': 'plugin'}) +let scmnr.2496 = vimpi#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/changed'}, {'changed.vim': 'plugin'}) +let scmnr.2542 = vimpi#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/starrange'}, {'starrange.vim': 'plugin'}) +let scmnr.2843 = vimpi#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/fliplr'}, {'fliplr.vim': 'plugin'}) +let scmnr.3162 = vimpi#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/tabops'}, {'tabops.vim': 'plugin'}) +let scmnr.3640 = vimpi#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/shu/theoldones'}, {'theoldones.vim': 'plugin'}) " dos Santos -let scmnr.3092 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/andre-luiz-dos-santos/autocomp'}, {'autocomp.vim': 'plugin'}) +let scmnr.3092 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/andre-luiz-dos-santos/autocomp'}, {'autocomp.vim': 'plugin'}) " Carlos Ruiz-Henestrosa -let scmnr.4122 = vamkr#AddCopyHook({'type': 'darcs', 'url': 'http://darcsden.com/karl/vim-ptsc-header'}, {'ptsc-header.vim': 'plugin'}) +let scmnr.4122 = vimpi#AddCopyHook({'type': 'darcs', 'url': 'http://darcsden.com/karl/vim-ptsc-header'}, {'ptsc-header.vim': 'plugin'}) " mihaly himics -let scmnr.3127 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/trialsolution/gamsvim'}, {'gams.vim': 'syntax'}) +let scmnr.3127 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/trialsolution/gamsvim'}, {'gams.vim': 'syntax'}) " Aydar Khabibullin -let scmnr.3428 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/abra/obsidian2'}, {'obsidian2.vim': 'colors'}) +let scmnr.3428 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/abra/obsidian2'}, {'obsidian2.vim': 'colors'}) " Andrew Lunny -let scmnr.4101 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/alunny/pegjs-vim'}, {'pegjs.vim': 'plugin'}) +let scmnr.4101 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/alunny/pegjs-vim'}, {'pegjs.vim': 'plugin'}) " Phui-Hock Chang -let scmnr.3917 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/phuihock/tagport.vim'}, {'tagport.vim': 'ftplugin'}) +let scmnr.3917 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/phuihock/tagport.vim'}, {'tagport.vim': 'ftplugin'}) " Michael Nussbaum " The following plugin does not have a separate repository: -let scmnr.3851 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/michaelnussbaum08/Mark-Ring'}, {'mark_ring.vim': 'plugin'}) +let scmnr.3851 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/michaelnussbaum08/Mark-Ring'}, {'mark_ring.vim': 'plugin'}) " Aldis Berjoza " The following plugin does not have a separate repository: let scmnr.3674 = {'url': 'https://github.com/graudeejs/dot.vim/raw/master/colors/universal-blue.vim', 'archive_name': 'universal-blue.vim', 'type': 'archive', 'script-type': 'color scheme'} " tien le -let scmnr.3414 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/tienle/bocau'}, {'bocau.vim': 'colors'}) +let scmnr.3414 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/tienle/bocau'}, {'bocau.vim': 'colors'}) " Jiri Kratochvil -let scmnr.3399 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/klokane/vim-phpunit'}, {'phpunit.vim': 'plugin'}) +let scmnr.3399 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/klokane/vim-phpunit'}, {'phpunit.vim': 'plugin'}) " Daniel B " The following plugins do not have a separate repository: -let scmnr.3140 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'obsidian.vim': 'colors'}) -let scmnr.3470 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'tidydiff.vim': 'plugin'}) -let scmnr.3693 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'FixCSS.vim': 'plugin'}) -let scmnr.3913 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'CapsulaPigmentorum.vim': 'colors'}) -let scm['plugins@dbb'] = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'CapsulaPigmentorum.vim': 'colors', 'FixCSS.vim': 'plugin', 'tidydiff.vim': 'plugin', 'obsidian.vim': 'colors'}) +let scmnr.3140 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'obsidian.vim': 'colors'}) +let scmnr.3470 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'tidydiff.vim': 'plugin'}) +let scmnr.3693 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'FixCSS.vim': 'plugin'}) +let scmnr.3913 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'CapsulaPigmentorum.vim': 'colors'}) +let scm['plugins@dbb'] = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/dbb/vim'}, {'CapsulaPigmentorum.vim': 'colors', 'FixCSS.vim': 'plugin', 'tidydiff.vim': 'plugin', 'obsidian.vim': 'colors'}) " Steffen Siering " The following plugin does not have a separate repository: let scmnr.3034 = {'url': 'https://github.com/urso/dotrc/raw/master/vim/syntax/haskell.vim', 'archive_name': 'haskell.vim', 'type': 'archive', 'script-type': 'syntax'} " C. Coutinho -let scmnr.3023 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/kikijump/tslime.vim'}, {'tslime.vim': 'plugin'}) +let scmnr.3023 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/kikijump/tslime.vim'}, {'tslime.vim': 'plugin'}) " joseph wecker -let scmnr.2964 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/josephwecker/neutron.vim'}, {'neutron.vim': 'colors'}) -let scm['murphytango'] = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/josephwecker/murphytango.vim'}, {'murphytango.vim': 'color scheme'}) +let scmnr.2964 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/josephwecker/neutron.vim'}, {'neutron.vim': 'colors'}) +let scm['murphytango'] = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/josephwecker/murphytango.vim'}, {'murphytango.vim': 'color scheme'}) " Einar Lielmanis -let scmnr.2469 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/einars/translit.vim'}, {'translit.vim': 'plugin'}) +let scmnr.2469 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/einars/translit.vim'}, {'translit.vim': 'plugin'}) " Chris Gaffney -let scmnr.2466 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/gaffneyc/vim-cdargs'}, {'cdargs.vim': 'plugin'}) +let scmnr.2466 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/gaffneyc/vim-cdargs'}, {'cdargs.vim': 'plugin'}) " Benjamin Hoffstein -let scmnr.2449 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/hoffstein/vim-tsql'}, {'sqlserver.vim': 'syntax'}) +let scmnr.2449 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/hoffstein/vim-tsql'}, {'sqlserver.vim': 'syntax'}) " Benjamin Esham -let scmnr.432 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/bdesham/biogoo'}, {'biogoo.vim': 'colors'}) +let scmnr.432 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/bdesham/biogoo'}, {'biogoo.vim': 'colors'}) " Hans Fugal -let scmnr.105 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/fugalh/desert.vim'}, {'desert.vim': 'colors'}) +let scmnr.105 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/fugalh/desert.vim'}, {'desert.vim': 'colors'}) " Peter Hosey -let scmnr.2475 = vamkr#AddCopyHook({'type': 'git', 'url': 'https://bitbucket.org/boredzo/vim-ini-syntax'}, {'ini.vim': 'syntax'}) +let scmnr.2475 = vimpi#AddCopyHook({'type': 'git', 'url': 'https://bitbucket.org/boredzo/vim-ini-syntax'}, {'ini.vim': 'syntax'}) " Jochen Bartl -let scmnr.2479 = vamkr#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/lobo/grsecurityvim'}, {'grsecurity.vim': 'syntax'}) +let scmnr.2479 = vimpi#AddCopyHook({'type': 'hg', 'url': 'https://bitbucket.org/lobo/grsecurityvim'}, {'grsecurity.vim': 'syntax'}) " Leandro Penz -let scmnr.808 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/lpenz/vimcommander'}, {'vimcommander.vim': 'plugin', 'vimcommander.txt': 'doc'}) +let scmnr.808 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/lpenz/vimcommander'}, {'vimcommander.vim': 'plugin', 'vimcommander.txt': 'doc'}) " Anders Schau Knatten -let scmnr.3733 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/knatten/olga_key'}, {'olga_key.vim': 'syntax'}) +let scmnr.3733 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/knatten/olga_key'}, {'olga_key.vim': 'syntax'}) " Jannis Pohlmann -let scmnr.2278 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://git.gezeiten.org/git/jptemplate'}, {'jptemplate.vim': 'plugin'}) +let scmnr.2278 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://git.gezeiten.org/git/jptemplate'}, {'jptemplate.vim': 'plugin'}) " Jian Liang let hook='if g:is_win | execute "edit" fnameescape(%d."/install_windows.bat") | %s@\V\w:\\vim\\vimfiles@.@ | else | execute "edit" fnameescape(%d."/install_linux_dev.sh") | %s@\V~/.vim@.@ | endif | write! | execute "lcd" fnameescape(%d) | call mkdir("plugin") | call vam#utils#RunShell(g:is_win ? "cmd .\\install_windows.bat" : "sh ./install_linux_dev.sh") | lcd -' @@ -1243,7 +1243,7 @@ let scm['vim-slime'] = {'type': 'git', 'url': 'git://github.com/jpalardy/vim-sli let scm['vimbufsync'] = {'type': 'git', 'url': 'git://github.com/def-lkb/vimbufsync', 'addon-info': {'runtimepath': 'vim/merlin'}} let scm['merlin'] = {'type': 'git', 'url': 'git://github.com/def-lkb/merlin', 'addon-info': {'runtimepath': 'vim/merlin', 'dependencies': {'vimbufsync': {}}}} let scm['ocp-indent'] = {'type': 'git', 'url': 'git://github.com/OCamlPro/ocp-indent'} -let scm['pgnvim'] = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/Raimondi/pgnvim'}, {'pgn.vim': 'syntax'}) +let scm['pgnvim'] = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/Raimondi/pgnvim'}, {'pgn.vim': 'syntax'}) " Marius Gedminas let scm['python-imports@mgedmin'] = {'type': 'git', 'url': 'git://github.com/mgedmin/python-imports.vim'} @@ -1306,8 +1306,8 @@ let scm['maktaba'] = {'type': 'git', 'url': 'git://github.com/google/maktaba'} " Jevgeni Tarasov " The following repository is referenced on vim.org, but not present on github: -" let scmnr.3570 = vamkr#AddCopyHook({'type': 'git', 'url': 'git://github.com/wolfsund/terse'}, {'terse.vim': 'plugin'}) +" let scmnr.3570 = vimpi#AddCopyHook({'type': 'git', 'url': 'git://github.com/wolfsund/terse'}, {'terse.vim': 'plugin'}) -" r: see vamkr#GetVim +" r: see vimpi#LoadDBFile let r=[scm, scmnr] " vim: ft=vim ts=2 sts=2 sw=2 et fdm=marker fmr=▶,▲ tw=0 nowrap diff --git a/doc/vim-addon-manager-known-repositories.txt b/doc/vim-pi.txt similarity index 100% rename from doc/vim-addon-manager-known-repositories.txt rename to doc/vim-pi.txt diff --git a/perl/find-in-sources-with-unknown-dev-version.pl b/perl/find-in-sources-with-unknown-dev-version.pl index 10a1cd4..d8596bc 100755 --- a/perl/find-in-sources-with-unknown-dev-version.pl +++ b/perl/find-in-sources-with-unknown-dev-version.pl @@ -14,7 +14,7 @@ print " but not ignore.lst file\n"; print " --nomaisnrdeps will make script also ignore plugins that have\n"; print " missing dependency information located in db/patch.vim\n"; - print "You must run this with current directory set to vam-kr root.\n"; + print "You must run this with current directory set to vim-pi root.\n"; print "Do not forget to run\n"; print " curl 'http://www.vim.org/script-info.php' > vodb.json\n"; print "before running this script unless you want make this script\n"; diff --git a/tools/checkdb.vim b/tools/checkdb.vim index ca57120..b9d67cb 100644 --- a/tools/checkdb.vim +++ b/tools/checkdb.vim @@ -30,10 +30,10 @@ let types = ['SCM unhooked source', \'archive hooked source'] try set rtp=. - let g:vam_kr_running_hook_test=1 + let g:vim_pi_running_hook_test=1 "▶1 Load vimorgsources try - let www_vim_org=vamkr#LoadDBFile('vimorgsources.json') + let www_vim_org=vimpi#LoadDBFile('vimorgsources.json') catch throw 'Error while loading vo DB file: '.v:exception endtry @@ -181,10 +181,10 @@ try throw 'End line not found' endif "▲1 - let scmsources=vamkr#LoadDBFile('scmsources.vim') - "▶1 Check whether vamkr#GetSCMSources runs properly (it has some checks on its own) + let scmsources=vimpi#LoadDBFile('scmsources.vim') + "▶1 Check whether vimpi#GetSCMSources runs properly (it has some checks on its own) redir => g:messages - call vamkr#GetSCMSources(snr_to_name, www_vim_org) + call vimpi#GetSCMSources(snr_to_name, www_vim_org) redir END if match(g:messages, '\S')!=-1 throw 'Not empty messages: '.g:messages @@ -233,7 +233,7 @@ try endfor "▶1 Prepare variables for patchinfo values checking try - let patchinfo=vamkr#LoadDBFile('patchinfo.vim') + let patchinfo=vimpi#LoadDBFile('patchinfo.vim') catch throw 'Error while loading patchinfo DB file: '.v:exception.' '.v:throwpoint endtry diff --git a/tools/scmdbhelpers.vim b/tools/scmdbhelpers.vim index 644efff..e19a8a7 100644 --- a/tools/scmdbhelpers.vim +++ b/tools/scmdbhelpers.vim @@ -12,12 +12,12 @@ function! GetAuthor() return matchstr(a, 'Author: \zs.*') endfunction function! s:GetScriptType(nr) - let nrnamesdb=vamkr#LoadDBFile('script-id-to-name-log.json') + let nrnamesdb=vimpi#LoadDBFile('script-id-to-name-log.json') let name=get(nrnamesdb, a:nr, [0])[0] if name is 0 return 'utility' endif - let vodb=vamkr#LoadDBFile('vimorgsources.json') + let vodb=vimpi#LoadDBFile('vimorgsources.json') return get(get(vodb, name, {}), 'script-type', 'utility') endfunction function! GetPrevSNR() @@ -57,7 +57,7 @@ endfunction function! AddGHUrl(url, nr) call append('.', s:ProcNR(a:url, a:nr). \ ((a:url=~#'\v\/(blob|raw)\/[^/]+\/.*\.vim$')? - \ ('vamkr#AddCopyHook({''type'': ''git'', ''url'': '.string(s:GitUrl(a:url)).'}, {'.string(substitute(a:url, '\v^.{-}\/%(blob|raw)\/[^/]+\/(.*)$', '\1', '')).': '.string(vam#utils#GuessFixDir(s:GetScriptType(a:nr))).'})'): + \ ('vimpi#AddCopyHook({''type'': ''git'', ''url'': '.string(s:GitUrl(a:url)).'}, {'.string(substitute(a:url, '\v^.{-}\/%(blob|raw)\/[^/]+\/(.*)$', '\1', '')).': '.string(vam#utils#GuessFixDir(s:GetScriptType(a:nr))).'})'): \ ((a:url=~#'^lp:')? \ ('{''type'': ''bzr'', ''url'': '.string(a:url).'}'): \ ((a:url=~#'svn')? diff --git a/zsh/UpdateVAM-kr.zsh b/zsh/Update.zsh similarity index 100% rename from zsh/UpdateVAM-kr.zsh rename to zsh/Update.zsh