diff --git a/README b/README index c7a4de5..d195c5c 100644 --- a/README +++ b/README @@ -23,7 +23,7 @@ For jslint to work you need to install node, npm and node-jslint npm: http://npmjs.org/ node-jslint: https://github.com/reid/node-jslint -For solarized color scheme to work in gnome terminal check out +For solarized color scheme to work in gnome terminal check out http://ethanschoonover.com/solarized https://github.com/coolwanglu/gnome-terminal-colors-solarized @@ -55,8 +55,8 @@ Useful key mappings: Installed Plugins (see .vim/bundle directory, managed by pathogen): -abolish, ack, bufexplorer, fugitive, fuzzyfinder, genutils, gist, gnupg, +abolish, ack, bufexplorer, fugitive, fuzzyfinder, genutils, gist, gnupg, gsession, gundo, fswitch, jekyll, jslint, L9, nerdcommenter, nerdtree, pastie, perforce, perl-support, project, pylint, repeat, scratch, -searchscope, showmarks, sparkup, speeddating, surround, tagbar, +searchscope, showmarks, sparkup, speeddating, surround, tagbar, unimpaired, vimoutliner, vim-perl, vim-colors-solarized diff --git a/bundle/bufexplorer/doc/bufexplorer.txt b/bundle/bufexplorer/doc/bufexplorer.txt index 06e9223..48f01dc 100644 --- a/bundle/bufexplorer/doc/bufexplorer.txt +++ b/bundle/bufexplorer/doc/bufexplorer.txt @@ -306,7 +306,7 @@ CHANGE LOG *bufexplorer-changelog* But the worse thing is, when I want to save the current buffer and type ':w', I get another error message: - E382: Cannot write, 'buftype' option is set + E382: Cannot write, 'buftype' option is set --------8<-------- 7.0.15 - Thanks to Mark Smithfield for suggesting bufexplorer needed to handle diff --git a/bundle/bufexplorer/plugin/bufexplorer.vim b/bundle/bufexplorer/plugin/bufexplorer.vim index 8791363..83a6872 100644 --- a/bundle/bufexplorer/plugin/bufexplorer.vim +++ b/bundle/bufexplorer/plugin/bufexplorer.vim @@ -142,20 +142,20 @@ function! s:BEAddBuffer() if !exists('s:raw_buffer_listing') || empty(s:raw_buffer_listing) silent let s:raw_buffer_listing = s:BEGetBufferInfo(0) else - " We cannot use :buffers! or :ls! to gather information + " We cannot use :buffers! or :ls! to gather information " about this buffer since it was only just added. - " Any changes to the buffer (setlocal buftype, ...) + " Any changes to the buffer (setlocal buftype, ...) " happens after this event fires. " " So we will indicate the :buffers! command must be re-run. " This should help with the performance of the plugin. - " There are some checks which can be performed + " There are some checks which can be performed " before deciding to refresh the buffer list. let bufnr = expand('') + 0 if s:BEIgnoreBuffer(bufnr) == 1 - return + return else let s:refreshBufferList = 1 endif @@ -174,7 +174,7 @@ function! s:BEActivateBuffer() endif if !empty(l) && l[0] == '-1' - " The first time we add a tab Vim uses the current + " The first time we add a tab Vim uses the current " buffer as it's starting page, even though we are about " to edit a new page (BufEnter triggers after), so " remove the -1 entry indicating we have covered this case. @@ -214,7 +214,7 @@ function! s:BEActivateBuffer() let shortlist = filter(copy(s:raw_buffer_listing), "v:val.attributes =~ '".'^\s*'.b.'u\>'."'") if !empty(shortlist) - " If it is unlisted (ie deleted), but now we editing it again + " If it is unlisted (ie deleted), but now we editing it again " rebuild the buffer list. let s:refreshBufferList = 1 endif @@ -279,7 +279,7 @@ function! s:BEInitialize() let s:running = 1 endfunction -" BEIgnoreBuffer +" BEIgnoreBuffer function! s:BEIgnoreBuffer(buf) " Check to see if this buffer should be ignore by BufExplorer. @@ -308,7 +308,7 @@ function! s:BEIgnoreBuffer(buf) return 1 end - return 0 + return 0 endfunction " BECleanup {{{1 @@ -363,7 +363,7 @@ function! StartBufExplorer(open) let s:originBuffer = bufnr("%") + 0 " Create or rebuild the raw buffer list if necessary. - if !exists('s:raw_buffer_listing') || + if !exists('s:raw_buffer_listing') || \ empty(s:raw_buffer_listing) || \ s:refreshBufferList == 1 silent let s:raw_buffer_listing = s:BEGetBufferInfo(0) @@ -401,8 +401,8 @@ endfunction " BEDisplayBufferList {{{1 function! s:BEDisplayBufferList() - " Do not set bufhidden since it wipes out - " the data if we switch away from the buffer + " Do not set bufhidden since it wipes out + " the data if we switch away from the buffer " using CTRL-^ setlocal buftype=nofile setlocal modifiable @@ -589,7 +589,7 @@ function! s:BEGetBufferInfo(bufnr) redir END if (a:bufnr > 0) - " Since we are only interested in this specified buffer + " Since we are only interested in this specified buffer " remove the other buffers listed let bufoutput = substitute(bufoutput."\n", '^.*\n\(\s*'.a:bufnr.'\>.\{-}\)\n.*', '\1', '') endif @@ -658,7 +658,7 @@ function! s:BEBuildBufferList() endif endfor - if show_buffer == 0 + if show_buffer == 0 continue endif endif @@ -715,7 +715,7 @@ function! s:BESelectBuffer(...) else call WinManagerFileEdit(bufname, 0) endif - + return endif @@ -775,7 +775,7 @@ function! s:BESelectBuffer(...) " Make the buffer 'listed' again. call setbufvar(_bufNbr, "&buflisted", "1") - + " call any associated function references " g:bufExplorerFuncRef may be an individual function reference " or it may be a list containing function references. @@ -843,7 +843,7 @@ function! s:BERemoveBuffer(type, mode) range if bufNbr !~ '^\d\+$' || getbufvar(bufNbr+0, '&modified') != 0 call s:BEError("Sorry, no write since last change for buffer ".bufNbr.", unable to delete") else - let _bufNbrs = _bufNbrs . (_bufNbrs==''?'':' '). bufNbr + let _bufNbrs = _bufNbrs . (_bufNbrs==''?'':' '). bufNbr endif endif endfor diff --git a/bundle/genutils/autoload/genutils.vim b/bundle/genutils/autoload/genutils.vim index a2892c4..9751378 100644 --- a/bundle/genutils/autoload/genutils.vim +++ b/bundle/genutils/autoload/genutils.vim @@ -494,7 +494,7 @@ endfunction " double-quote) and just '"'"' otherwise. Embedded double-quotes also need " to be doubled. " - For Unix+sh, use single-quotes to sorround the arguments and for embedded -" single-quotes, just replace them with '"'"'. +" single-quotes, just replace them with '"'"'. function! genutils#EscapeCommand(cmd, args, pipe) if type(a:args) == 3 let args = copy(a:args) @@ -570,7 +570,7 @@ endfunction function! genutils#ExpandStr(str) let str = substitute(a:str, '"', '\\"', 'g') - exec "let str = \"" . str . "\"" + exec "let str = \"" . str . "\"" return str endfunction @@ -671,7 +671,7 @@ function! s:RestoreWindowSettings2(id) let winNo = winNo + 1 let i = i + 2 endwhile - + " Restore the current window. call genutils#MoveCursorToWindow(activeWindow) "unlet g:savedWindowSettings @@ -825,7 +825,7 @@ function! genutils#RestoreSoftPosition(id) call genutils#RestoreHardPosition(a:id) let stLine = b:sp_startline_{a:id} if getline('.') !=# stLine - if ! search('\V\^'.escape(stLine, "\\").'\$', 'W') + if ! search('\V\^'.escape(stLine, "\\").'\$', 'W') call search('\V\^'.escape(stLine, "\\").'\$', 'bW') endif endif @@ -929,7 +929,7 @@ function! genutils#RemoveNotifyWindowClose(windowTitle) call remove(s:notifyWindow, bufName) if len(s:notifyWindow) == 0 "unlet g:notifyWindow " Debug. - + aug NotifyWindowClose au! aug END @@ -1080,7 +1080,7 @@ function! genutils#ShiftWordInSpace(dir) if getline(".")[col(".") - 1] == " " let move1 = 'wf ' else - " If next col is a + " If next col is a "if getline(".")[col(".") + 1] let move1 = 'f ' endif @@ -1225,7 +1225,7 @@ function! genutils#UserFileComplete2(ArgLead, CmdLine, CursorPos, ...) \ .ArgTail).'*' for nextPath in split(searchPath, genutils#CrUnProtectedCharsPattern(','), 1) " Ignore paths if the ArgHead happens to be an absolute path. - let nextPath = genutils#PathIsAbsolute(ArgHead) ? '' : + let nextPath = genutils#PathIsAbsolute(ArgHead) ? '' : \ genutils#CleanupFileName(nextPath).npathsep let matches = split(glob(nextPath.pat), "\n") if len(matches) != 0 @@ -1972,7 +1972,7 @@ function! s:Match(expr, pat, start) endtry return result endfunction - + " Restore cpo. let &cpo = s:save_cpo unlet s:save_cpo diff --git a/bundle/genutils/plugin/genutils.vim b/bundle/genutils/plugin/genutils.vim index fdf5094..c7df816 100644 --- a/bundle/genutils/plugin/genutils.vim +++ b/bundle/genutils/plugin/genutils.vim @@ -5,7 +5,7 @@ " Version: 2.5.1 " Licence: This program is free software; you can redistribute it and/or " modify it under the terms of the GNU General Public License. -" See http://www.gnu.org/copyleft/gpl.txt +" See http://www.gnu.org/copyleft/gpl.txt " Acknowledgements: " - The genutils#GetNextWinnrInStack() function is based on the WinStackMv() " function posted by Charles E. Campbell, Jr. on vim mailing list on Jul @@ -202,7 +202,7 @@ " ----------------------- " Useful function to debug passing arguments to functions. See exactly what " you would receive on the other side. -" Ex: :exec 'call genutils#DebugShowArgs('. genutils#CreateArgString("a 'b' c", ' ') . ')' +" Ex: :exec 'call genutils#DebugShowArgs('. genutils#CreateArgString("a 'b' c", ' ') . ')' " " void genutils#DebugShowArgs(...) " ----------------------- @@ -360,7 +360,7 @@ " Turns off those options that are set by diff to the current window. " Also removes the 'hor' option from scrollopt (which is a global option). " Better alternative would be to close the window and reopen the buffer in a -" new window. +" new window. " " void genutils#CleanDiffOptions() " ----------------------- @@ -467,7 +467,7 @@ " void genutils#SaveHardPosition(String id) " ----------------------- " Restore the cursor position using the information saved by the previous call -" to genutils#SaveHardPosition. +" to genutils#SaveHardPosition. " " void genutils#RestoreHardPosition(String id) " ----------------------- @@ -562,7 +562,7 @@ " ----------------------- " This function centers the current word in the space without changing the " column position of the next word. Doesn't work for tabs. -" +" " void genutils#CenterWordInSpace() " ----------------------- " ----------------------- @@ -631,7 +631,7 @@ " string, so something like: 'a\b\\\\c\\d' would become 'ab\\c\d'. " " String genutils#DeEscape(String str) -" ----------------------- +" ----------------------- " This function creates a pattern that avoids the given protected characters' " from getting treated as separators, when used with split(). The argument " goes directly into the [] atom, so make sure you pass in a valid string. @@ -641,7 +641,7 @@ " let paths = split(&path, genutils#CrUnProtectedCharsPattern(',')) " " String genutils#CrUnProtectedCharsPattern(String chars, [boolean capture = false]) -" ----------------------- +" ----------------------- " genutils#Escape the passed in shell command with quotes and backslashes such " a way that the arguments reach the command literally (avoids shell " interpretations). See the function header for the kind of escapings that @@ -783,19 +783,19 @@ " >>>>t.vim<<<< " au VimEnter * call LoadSettings() " au VimLeavePre * call SaveSettings() -" +" " function! LoadSettings() " let s:tVar = genutils#GetPersistentVar("T", "tVar", "defVal") " endfunction -" +" " function! SaveSettings() " call genutils#PutPersistentVar("T", "tVar", s:tVar) " endfunction -" +" " function! SetVar(val) " let s:tVar = a:val " endfunction -" +" " function! GetVar() " return s:tVar " endfunction @@ -851,7 +851,7 @@ " Same as genutils#AddToFCShellPre except that the function is called after " the event is processed, so this is like a fictitious FileChangedShellPost " event. -" +" " void genutils#DefFCShellInstall() " ----------------------- " Uninstall the default autocommand handler that was previously installed @@ -951,7 +951,7 @@ " bufwinnr(genutils#FindBufferForName(fileName)) " - QSort(), QSort2(), BinInsertSort() and BinInsertSort2() functions are " now deprecated in favor of sort() function. -" +" " " Sample Usages Or Tips: " - Add the following commands to create simple sort commands. diff --git a/bundle/perforce/autoload/perforce.vim b/bundle/perforce/autoload/perforce.vim index 460ef9c..c3c675a 100755 --- a/bundle/perforce/autoload/perforce.vim +++ b/bundle/perforce/autoload/perforce.vim @@ -34,7 +34,7 @@ endif " Special characters in a filename that are not acceptable in a filename (as a " window title) on windows. -let s:specialChars = '\([*:?"<>|]\)' +let s:specialChars = '\([*:?"<>|]\)' let s:specialCharsMap = { \ '*': 'S', \ ':': 'C', @@ -236,9 +236,9 @@ let s:haveItemHandler = "s:OpenFile" " Define handlers for built-in commands. These have no arguments, they will " use the existing parsed command-line vars. Set s:errCode on errors. -let s:builtinCmdHandler{'vdiff'} = 's:VDiffHandler' -let s:builtinCmdHandler{'vdiff2'} = 's:VDiff2Handler' -let s:builtinCmdHandler{'exec'} = 's:ExecHandler' +let s:builtinCmdHandler{'vdiff'} = 's:VDiffHandler' +let s:builtinCmdHandler{'vdiff2'} = 's:VDiff2Handler' +let s:builtinCmdHandler{'exec'} = 's:ExecHandler' let s:vdiffCounter = 0 @@ -1028,7 +1028,7 @@ function! s:PHelpComplete(ArgLead, CmdLine, CursorPos) \ "simple\ncommands\nenvironment\nfiletypes\njobview\nrevisions\n". \ "usage\nviews\n" endfunction - + " Handler for opened command. function! s:OpenFile(scriptOrigin, outputType, fileName) " {{{ if filereadable(a:fileName) @@ -1280,7 +1280,7 @@ function! s:SetupFileBrowse() " {{{ command! -buffer -nargs=0 PFileSync :call perforce#PFIF(1, 2, 'sync', \ GetCurrentItem()) nnoremap S :PFileSync - command! -buffer -nargs=0 PFileChange :call perforce#PFIF(0, 0, 'change', + command! -buffer -nargs=0 PFileChange :call perforce#PFIF(0, 0, 'change', \ GetCurrentChangeNumber(line("."))) nnoremap C :PFileChange command! -buffer -nargs=0 PFileLaunch :call LaunchCurrentFile() @@ -1608,7 +1608,7 @@ endfunction " The commandName may not be the perforce command when it is not of script " origin (called directly from a command), but it should be always command " name, when it is script origin. -" scriptOrigin: An integer indicating the origin of the call. +" scriptOrigin: An integer indicating the origin of the call. " 0 - Originated directly from the user, so should redirect to the specific " command handler (if exists), after some basic processing. " 1 - Originated from the script, continue with the full processing (makes @@ -1649,7 +1649,7 @@ function! perforce#PFrangeIF(fline, lline, scriptOrigin, outputType, return s:{s:p4Command}Hdlr(1, s:outputType, a:commandName) endif endif - + let modifyWindowName = 0 let dontProcess = (index(s:p4Options, '++n') != -1) let noDefaultArg = (index(s:p4Options, '++N') != -1) @@ -1735,7 +1735,7 @@ function! perforce#PFrangeIF(fline, lline, scriptOrigin, outputType, endif if branchModifierSpecified - call map(s:p4Arguments, + call map(s:p4Arguments, \ '(v:val =~ unprotectedAmp ? s:ApplyBranchSpecs(v:val, unprotectedAmp) : v:val)') endif " Unescape them, as user is required to escape them to avoid the above @@ -1768,7 +1768,7 @@ function! perforce#PFrangeIF(fline, lline, scriptOrigin, outputType, " Use simple window name for all the help commands. let s:p4WinName = s:helpWinName elseif modifyWindowName - let s:p4WinName = s:MakeWindowName() + let s:p4WinName = s:MakeWindowName() endif " If the command is a built-in command, then don't pass it to external p4. @@ -1793,7 +1793,7 @@ function! perforce#PFrangeIF(fline, lline, scriptOrigin, outputType, let specMode = 1 endif endif - + let navigateCmd = 0 if index(s:navigateCmds, s:p4Command) != -1 let navigateCmd = 1 @@ -2465,7 +2465,7 @@ function! s:InitWindow(p4Options) call genutils#SilentSubstitute("\$", '%s///e') setlocal nomodifiable setlocal nomodified - + if s:outputType == 1 wincmd p endif @@ -2568,7 +2568,7 @@ function! s:GetP4Options() let s:p4User = p4User let s:p4Port = p4Port endtry - + return addOptions endfunction @@ -3223,7 +3223,7 @@ endfunction " This better take the line as argument, but I need the context of current " buffer contents anyway... " I don't need to handle other revision specifiers here, as I won't expect to -" see them here (perforce converts them to the appropriate revision number). +" see them here (perforce converts them to the appropriate revision number). function! s:GetCurrentDepotFile(lineNo) " Local submissions. let fileName = "" @@ -3678,7 +3678,7 @@ call perforce#ToggleCheckOutPrompt(0) endfunction " s:Initialize }}} """ END: Infrastructure }}} - + " Do some initializations. if g:p4DefaultPreset != -1 && \ g:p4DefaultPreset.'' !~# s:EMPTY_STR diff --git a/bundle/perforce/autoload/perforceutils.vim b/bundle/perforce/autoload/perforceutils.vim index 2009413..1988a78 100755 --- a/bundle/perforce/autoload/perforceutils.vim +++ b/bundle/perforce/autoload/perforceutils.vim @@ -19,7 +19,7 @@ delfunction s:MyScriptId " This is not needed anymore. " plugins) at the time this file is sourced. " DiffLink {{{ - + " Open the source line for the current line from the diff. function! perforceutils#DiffOpenSrc(preview) " {{{ let s:EMPTY_STR = perforce#PFEval('s:EMPTY_STR') diff --git a/bundle/perforce/doc/perforce.txt b/bundle/perforce/doc/perforce.txt index 32d6985..3d2c136 100755 --- a/bundle/perforce/doc/perforce.txt +++ b/bundle/perforce/doc/perforce.txt @@ -2238,7 +2238,7 @@ missed some changes. - On Windows, allow execution of commands containing filename special characters by replacing them with a [x] sequence. They are mapped as, > - '*' -> [S], + '*' -> [S], ':' -> [C], '?' -> [Q], '"' -> [D], diff --git a/bundle/perforce/perforce/perforcebugrep.vim b/bundle/perforce/perforce/perforcebugrep.vim index 1bf1894..b994ec2 100755 --- a/bundle/perforce/perforce/perforcebugrep.vim +++ b/bundle/perforce/perforce/perforcebugrep.vim @@ -6,7 +6,7 @@ " Version: 2.1.0 " Licence: This program is free software; you can redistribute it and/or " modify it under the terms of the GNU General Public License. -" See http://www.gnu.org/copyleft/gpl.txt +" See http://www.gnu.org/copyleft/gpl.txt if !exists("loaded_perforce") runtime plugin/perforce.vim diff --git a/bundle/perforce/perforce/perforcemenu.vim b/bundle/perforce/perforce/perforcemenu.vim index 6d0be2b..cf6c4d8 100755 --- a/bundle/perforce/perforce/perforcemenu.vim +++ b/bundle/perforce/perforce/perforcemenu.vim @@ -6,7 +6,7 @@ " Version: 2.1.0 " Licence: This program is free software; you can redistribute it and/or " modify it under the terms of the GNU General Public License. -" See http://www.gnu.org/copyleft/gpl.txt +" See http://www.gnu.org/copyleft/gpl.txt if !exists("loaded_perforce") runtime plugin/perforce.vim diff --git a/bundle/perforce/perforce/perforceutils.vim b/bundle/perforce/perforce/perforceutils.vim index db093bb..a20af04 100755 --- a/bundle/perforce/perforce/perforceutils.vim +++ b/bundle/perforce/perforce/perforceutils.vim @@ -6,7 +6,7 @@ " Version: 1.2.0 " Licence: This program is free software; you can redistribute it and/or " modify it under the terms of the GNU General Public License. -" See http://www.gnu.org/copyleft/gpl.txt +" See http://www.gnu.org/copyleft/gpl.txt " NOTE: " - This may not work well if there are multiple diff formats are mixed in " the same file. @@ -30,7 +30,7 @@ aug P4DiffLink \ call perforceutils#SetupDiffLink() | \ endif aug END - + " Restore cpo. let &cpo = s:save_cpo diff --git a/bundle/perforce/perforce/restor.sh b/bundle/perforce/perforce/restor.sh index 2da076d..ba899c6 100755 --- a/bundle/perforce/perforce/restor.sh +++ b/bundle/perforce/perforce/restor.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Author: Hari Krishna Dara ( hari_vim at yahoo dot com ) +# Author: Hari Krishna Dara ( hari_vim at yahoo dot com ) # Last Change: 06-Jan-2004 @ 19:07 # Requires: # - bash or ksh (tested on cygwin and MKS respectively). @@ -9,7 +9,7 @@ # Version: 1.1.0 # Licence: This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License. -# See http://www.gnu.org/copyleft/gpl.txt +# See http://www.gnu.org/copyleft/gpl.txt usage() { cat < " On Windoze+sh: " sh -c "" " On Unix+sh: -" sh -c () +" sh -c () " - By the time we parse arguments, we protect all the back-slashes, which " means that we would never see a single-back-slash. " - Using back-slashes on Cygwin vim is unique and causes E303. This is @@ -151,7 +151,7 @@ function! s:CondDefSetting(settingName, def) let {a:settingName} = a:def endif endfunction - + call s:CondDefSetting('g:p4CmdPath', 'p4') call s:CondDefSetting('g:p4ClientRoot', '') call s:CondDefSetting('g:p4DefaultListSize', '100') diff --git a/bundle/perforce/syntax/perforce.vim b/bundle/perforce/syntax/perforce.vim index ab3efa7..9280e4e 100755 --- a/bundle/perforce/syntax/perforce.vim +++ b/bundle/perforce/syntax/perforce.vim @@ -79,7 +79,7 @@ syn match perforceChangeNumber "\%(by change \)\@<=\d\+ \@=" contained " opened, files, have etc. -" The format of have is different because it contains the local file. +" The format of have is different because it contains the local file. syn match perforceFilelistLine "^//[^/[:space:]]\+/.*#\d\+ - .*$" contains=perforceDepotFileSpec,perforceLocalFile " have syn match perforceFilelistLine "^//[^/[:space:]]\+/.*#\d\+ - \%(branch\|integrate\|edit\|delete\|add\).*$" contains=perforceDepotFileSpec,perforceSubmitType,perforceDefaultSubmitType,perforceChangeNumber " opened, files syn match perforceChangeNumber "\%( change \)\@<=\d\+ \@=" contained diff --git a/bundle/project/doc/project.txt b/bundle/project/doc/project.txt index 8f85c23..616a5a4 100644 --- a/bundle/project/doc/project.txt +++ b/bundle/project/doc/project.txt @@ -1,7 +1,7 @@ *project.txt* Plugin for managing multiple projects with multiple sources For Vim version 6.x and Vim version 7.x. Last Change: Fri 13 Oct 2006 10:20:13 AM EDT - + By Aric Blumer aricvim email-at-sign charter.net @@ -244,7 +244,7 @@ Map Action ~ line, and the file entry on that line will not be removed when you refresh. This is useful, for example, when you have . as an entry so you can easily browse the directory. - + Note that this mapping is actually r, and the default of || is \. @@ -541,7 +541,7 @@ g:proj_flags g:proj_run1 ... g:proj_run9 Contains a Vim command to execute on the file. See the mappings of \1 to \9 above. - + %f is replaced with the full path and filename %F is replaced with the full path and filename with spaces quoted @@ -575,7 +575,7 @@ g:proj_run1 ... g:proj_run9 g:proj_run_fold1 ... g:proj_run_fold9 Contains a Vim command to execute on the files in a fold. See the mappings of \f1 to \f9 and \F1 to \F9 above. - + %f is the filename, %h is replaced with the project home directory, and %d is replaced with the CD directory. Multiple filenames can be handled in two ways: diff --git a/bundle/pylint/compiler/pylint.vim b/bundle/pylint/compiler/pylint.vim index 662e7d7..8a528b4 100644 --- a/bundle/pylint/compiler/pylint.vim +++ b/bundle/pylint/compiler/pylint.vim @@ -1,8 +1,8 @@ " Vim compiler file for Python " Compiler: Style checking tool for Python " Maintainer: Oleksandr Tymoshenko -" Last Change: 2009 Apr 19 -" Version: 0.5 +" Last Change: 2009 Apr 19 +" Version: 0.5 " Contributors: " Artur Wroblewski " Menno @@ -65,7 +65,7 @@ if exists(":CompilerSet") != 2 " older Vim always used :setlocal endif " We should echo filename because pylint truncates .py -" If someone know better way - let me know :) +" If someone know better way - let me know :) CompilerSet makeprg=(echo\ '[%]';\ pylint\ -r\ y\ %) " We could omit end of file-entry, there is only one file @@ -84,7 +84,7 @@ function! Pylint(writing) if !a:writing && &modified " Save before running write - endif + endif if has('win32') || has('win16') || has('win95') || has('win64') setlocal sp=>%s @@ -121,7 +121,7 @@ function! PylintEvaluation() " Only if there is information about previous run if l:item.text =~ 'previous run: ' let b:pylint_prev_rate = substitute(l:item.text, '.*previous run: '.l:re_rate.'.*', '\1', 'g') - endif + endif endif endfor endfunction diff --git a/bundle/vimoutliner/INSTALL b/bundle/vimoutliner/INSTALL index bcc2735..1d1892e 100644 --- a/bundle/vimoutliner/INSTALL +++ b/bundle/vimoutliner/INSTALL @@ -1,4 +1,4 @@ -INSTALLING AND TESTING VIMOUTLINER +INSTALLING AND TESTING VIMOUTLINER How do I install VimOutliner? Automatic Method |vo-auto-install| @@ -6,10 +6,10 @@ INSTALLING AND TESTING VIMOUTLINER Manual Method |vo-manual-install| Testing |vo-testing| - Automatic method + Automatic method The new automatic installation targets Unix-compatible - platforms. + platforms. $ tar xzvf vimoutliner-0.3.x.tar.gz $ cd vimoutliner $ ./install.sh @@ -24,7 +24,7 @@ INSTALLING AND TESTING VIMOUTLINER install some brand new add-ons, currently implementing hoisting and checkboxes. - Updating an existing installation + Updating an existing installation Updating an existing installation might require some manual work. @@ -38,19 +38,19 @@ INSTALLING AND TESTING VIMOUTLINER being replaced with newer versions. So if you put some local customisations into, say $HOME/.vimoutlinerrc, you'll probably have to merge the backup with the new file by hand. - - Manual method + + Manual method You can also copy the files from the unpacked distribution tarball into their destination folders by yourself. The following steps are a description of what has to go where and assume some knowledge of your vim setup. - + If you encounter problems, please contact the mailinglist for an immediate solution and more complete future documentation. www.lists.vimoutliner.org - + If you want to setup VimOutliner on a system running Microsoft Windows, the directory $HOME denotes the base folder of the vim installation. If you're on Unix based system, $HOME @@ -88,7 +88,7 @@ INSTALLING AND TESTING VIMOUTLINER Your $HOME/.vim/ftplugin/vo_base.vim file should contain the lines runtime! ftdetect/*.vim - + Finally, you need to integrate the online help provided with VimOutliner into the vim help system. Start vim and execute the following command: @@ -96,8 +96,8 @@ INSTALLING AND TESTING VIMOUTLINER At this point, VimOutliner should be functional. Type "help vo" to get started. - - Testing base functionality + + Testing base functionality rm $HOME/vo_test.otl gvim $HOME/vo_test.otl @@ -130,9 +130,9 @@ INSTALLING AND TESTING VIMOUTLINER In $HOME/vo_test.otl Cursor to the _tag_newfile marker Press Ctrl+K - You should be brought to $HOME/vo_newfile.otl + You should be brought to $HOME/vo_newfile.otl Press Ctrl+N - You should be brought back to $HOME/vo_test.otl + You should be brought back to $HOME/vo_test.otl Note: Ctrl+K is a VimOutliner synonym for Ctrl+] Ctrl+N is a VimOutliner synonym for Ctrl+T diff --git a/bundle/vimoutliner/LICENSE b/bundle/vimoutliner/LICENSE index 53edeef..8700b68 100644 --- a/bundle/vimoutliner/LICENSE +++ b/bundle/vimoutliner/LICENSE @@ -1,11 +1,11 @@ -LICENSE +LICENSE VimOutliner Copyright (C) 2001, 2003 by Steve Litt Copyright (C) 2004 by Noel Henson Licensed under the GNU General Public License (GPL), version 2 Absolutely no warranty. - + If your distro doesn't come with this file HTML: http://www.gnu.org/copyleft/gpl.html - Text: http://www.gnu.org/copyleft/gpl.txt + Text: http://www.gnu.org/copyleft/gpl.txt diff --git a/bundle/vimoutliner/VERSION b/bundle/vimoutliner/VERSION index 6066a09..12b5c1d 100644 --- a/bundle/vimoutliner/VERSION +++ b/bundle/vimoutliner/VERSION @@ -1,15 +1,15 @@ VERSION *vo-version* Version 0.3.4 - Released - + Released + Additions/changes: added ,,cp as an alias to ,,c% Color schemes have been added Checkboxes and hoisting default to 'on' Modified ,,cb and ,,c% (and ,,cp) to work only on headings Fixed the ,,cz command to make the correct call - Added descriptions of VO objects to help + Added descriptions of VO objects to help (headings, text, tables, etc.) Bug fixes: diff --git a/bundle/vimoutliner/add-ons/plugins/vo_checkbox.otl b/bundle/vimoutliner/add-ons/plugins/vo_checkbox.otl index f09c377..f59e5d0 100644 --- a/bundle/vimoutliner/add-ons/plugins/vo_checkbox.otl +++ b/bundle/vimoutliner/add-ons/plugins/vo_checkbox.otl @@ -2,7 +2,7 @@ Checkboxes: vo_checkbox What is it? : Checkboxes is a plugin for project, task and list managment. It add an : understanding of check boxes and percentage of task completion to Vim - : Outliner. It adds just three tags and six commands. + : Outliner. It adds just three tags and six commands. Installation This should already be included in your Vim Outliner package If not, get it @@ -33,11 +33,11 @@ The Checkbox Commands : included in the standard Vim Outliner plugins. ,,cB Create a check box (even if one exists) ,,c% Create a checkbox and % symbol - : This works just like ,,cb but add a % symbol for use in completion + : This works just like ,,cb but add a % symbol for use in completion : calculations. ,,cx Change check box state : If there is a checkbox on the line the cursor is on, change its - : state. If it's checked, uncheck it and vice-versa. Then recompute + : state. If it's checked, uncheck it and vice-versa. Then recompute : the completion of the entire branch starting from the root parent. ,,cd Delete a checkbox : Delete the left-most check box on the selected heading(s). diff --git a/bundle/vimoutliner/add-ons/plugins/vo_checkbox.vim b/bundle/vimoutliner/add-ons/plugins/vo_checkbox.vim index bcc3461..daf9dd5 100755 --- a/bundle/vimoutliner/add-ons/plugins/vo_checkbox.vim +++ b/bundle/vimoutliner/add-ons/plugins/vo_checkbox.vim @@ -174,7 +174,7 @@ function! SafelyInsertCheckBox() endfunction "}}}1 " Safely InsertCheckBoxPercent() {{{1 -" Insert a checkbox and % sign at the beginning of a header without disturbing +" Insert a checkbox and % sign at the beginning of a header without disturbing " the current folding only if there is no checkbox already. function! SafelyInsertCheckBoxPercent() if match(getline("."),"^\t\t*\[<>:;|\]") != -1 @@ -191,8 +191,8 @@ function! SafelyInsertCheckBoxPercent() endfunction "}}}1 " Safely InsertCheckBoxPercentAlways() {{{1 -" Insert a checkbox and % sign at the beginning of a header without disturbing -" the current folding only if there is no checkbox already. Include the +" Insert a checkbox and % sign at the beginning of a header without disturbing +" the current folding only if there is no checkbox already. Include the " checkbox even on childless headings. function! SafelyInsertCheckBoxPercentAlways() if match(getline("."),"^\t\t*\[<>:;|\]") != -1 @@ -210,7 +210,7 @@ function! SwitchBox() let questa = strridx(getline("."),"[_]") let questb = strridx(getline("."),"[X]") if (questa != -1) || (questb != -1) - if (questa != -1) + if (questa != -1) substitute/\[_\]/\[X\]/ else substitute/\[X\]/\[_\]/ @@ -224,7 +224,7 @@ function! DeleteCheckbox() let questa = strridx(getline("."),"[_]") let questb = strridx(getline("."),"[X]") if (questa != -1) || (questb != -1) - if (questa != -1) + if (questa != -1) substitute/\(^\s*\)\[_\] \(.*\)/\1\2/ else substitute/\(^\s*\)\[X\] \(.*\)/\1\2/ @@ -252,7 +252,7 @@ function! FindRootParent(line) endf " NewHMD(line) {{{1 -" (How Many Done) +" (How Many Done) " Calculates proportion of already done work in the subtree function! NewHMD(line) let l:done = 0 @@ -274,7 +274,7 @@ function! NewHMD(line) else if match(getline(a:line),"\\[X\\]") != -1 let l:proportion = 100 - else + else let l:proportion = 0 endif endif diff --git a/bundle/vimoutliner/add-ons/plugins/vo_hoist.otl b/bundle/vimoutliner/add-ons/plugins/vo_hoist.otl index 3e4238e..89e0cf9 100644 --- a/bundle/vimoutliner/add-ons/plugins/vo_hoist.otl +++ b/bundle/vimoutliner/add-ons/plugins/vo_hoist.otl @@ -1,8 +1,8 @@ Hoisting What is it? - : Hoisting is a way to focus on a particular area of an outline. Only the - : offspring from a selected parent will be shown. The offspring are - : left-justified just as if they were the top level headings and had no + : Hoisting is a way to focus on a particular area of an outline. Only the + : offspring from a selected parent will be shown. The offspring are + : left-justified just as if they were the top level headings and had no : parent. Installation Get the newest, possibly unstable vo_hoist.vim @@ -15,10 +15,10 @@ Installation Add this line to your ~/.vimoutlinerrc so /vo_hoist.vim Optionally set the hoistParanoia variable - : If you are really paranoid about loosing your data during shakedown - : of vo_hoist.vim, you can add this to your ~/.vimoutlinerrc file. It - : will prevent VO from automatically removing the temporary hoist - : files. This will have a tendency to hugely increase the number of + : If you are really paranoid about loosing your data during shakedown + : of vo_hoist.vim, you can add this to your ~/.vimoutlinerrc file. It + : will prevent VO from automatically removing the temporary hoist + : files. This will have a tendency to hugely increase the number of : files in your working directory (but if you're paranoid... ;) ) let g:hoistParanoia = 1 How do I use it? @@ -31,15 +31,15 @@ How do I use it? You should now see the children of the selected parent ready for editing Treat this document just like a normal .otl file De-hoisting - : From within the hoisted document you simply need to quit. The - : hoisted data will be saved in place of the old children. The cursor + : From within the hoisted document you simply need to quit. The + : hoisted data will be saved in place of the old children. The cursor : will be returned to the hoisted parent. Invocation The :q, :wq, :x and ZZ perform a de-hoist operation A write will automatically be done to save any changes Manual De-hoisting - : Should the de-hoisting ever fail or should an operator quit Vim (by - : closing the window with the mouse, say), a manual de-hoisting will + : Should the de-hoisting ever fail or should an operator quit Vim (by + : closing the window with the mouse, say), a manual de-hoisting will : need to be performed. You can find a currently hoisted parent by searching for __hoist Place the cursor on the parent with the __hoist tag @@ -48,7 +48,7 @@ How do I use it? The __hoist tag will be removed The Hoist Tag Example Tag - : The hoist tag is added to a hoisted parent for error recovery. It + : The hoist tag is added to a hoisted parent for error recovery. It : includes a filename, a line number and a timestamp. Example Tag __hoist:vo_hoist.46.20030816124249.otl @@ -68,8 +68,8 @@ The Hoist Tag .otl Duh The Log Files - : Log files of the hoists are created to aid in error recovery should that - : become necessary. They are created in the same directory as the working + : Log files of the hoists are created to aid in error recovery should that + : become necessary. They are created in the same directory as the working : .otl file. Log Filename .vo_hoist..log diff --git a/bundle/vimoutliner/add-ons/plugins/vo_hoist.vim b/bundle/vimoutliner/add-ons/plugins/vo_hoist.vim index 80de1a6..5b3abfa 100755 --- a/bundle/vimoutliner/add-ons/plugins/vo_hoist.vim +++ b/bundle/vimoutliner/add-ons/plugins/vo_hoist.vim @@ -110,7 +110,7 @@ endfunction " IsHoistedParent(line) {{{2 " Return 1 if this line is a parent with hoisted children function! IsHoistParent(line) - return match(getline(a:line)," __hoist:","") != -1 + return match(getline(a:line)," __hoist:","") != -1 endfunction "}}}2 " FindParent(line) {{{2 @@ -141,7 +141,7 @@ endfunction "}}}2 "}}}2 " Hoist(line) {{{2 -" Write the offspring of a parent to a new file, open it and remove the +" Write the offspring of a parent to a new file, open it and remove the " leading tabs. function! Hoist(line) let l:parent = FindParent(a:line) @@ -197,8 +197,8 @@ function! MakeTabString(n) endfunction "}}}2 " AddChildren(line) {{{2 -" Add left-justified children to parent. The filename is extracted from the -" end of the parent line. The parent is assumed to have no children at this +" Add left-justified children to parent. The filename is extracted from the +" end of the parent line. The parent is assumed to have no children at this " point. function! AddChildren(line) let l:filename = ExtractHoistFilename(a:line) diff --git a/bundle/vimoutliner/colors/vo_dark.vim b/bundle/vimoutliner/colors/vo_dark.vim index 894f17a..ac6b580 100644 --- a/bundle/vimoutliner/colors/vo_dark.vim +++ b/bundle/vimoutliner/colors/vo_dark.vim @@ -38,7 +38,7 @@ hi PT7 guifg=blue ctermfg=cyan hi PT8 guifg=blue ctermfg=cyan hi PT9 guifg=blue ctermfg=cyan -" color for tables +" color for tables hi TA1 guifg=darkviolet ctermfg=cyan hi TA2 guifg=darkviolet ctermfg=cyan hi TA3 guifg=darkviolet ctermfg=cyan diff --git a/bundle/vimoutliner/colors/vo_light.vim b/bundle/vimoutliner/colors/vo_light.vim index beef395..27956c6 100644 --- a/bundle/vimoutliner/colors/vo_light.vim +++ b/bundle/vimoutliner/colors/vo_light.vim @@ -38,7 +38,7 @@ hi PT7 guifg=darkblue ctermfg=cyan hi PT8 guifg=darkblue ctermfg=cyan hi PT9 guifg=darkblue ctermfg=cyan -" color for tables +" color for tables hi TA1 guifg=darkviolet ctermfg=cyan hi TA2 guifg=darkviolet ctermfg=cyan hi TA3 guifg=darkviolet ctermfg=cyan diff --git a/bundle/vimoutliner/doc/vo_readme.txt b/bundle/vimoutliner/doc/vo_readme.txt index 2102a08..be1973a 100644 --- a/bundle/vimoutliner/doc/vo_readme.txt +++ b/bundle/vimoutliner/doc/vo_readme.txt @@ -21,7 +21,7 @@ Contents Vim Outliner objects |vo-objects| Post Processors |vo-post-processors| CAUTIONS!!! |vo-cautions| - ADVANCED |vo-advanced| + ADVANCED |vo-advanced| Executable Lines |vo-executable-lines| PLUGINS |vo-plugins| Checkboxes |vo-checkbox| @@ -38,24 +38,24 @@ LICENSE *vo-license* Copyright (C) 2004 by Noel Henson Licensed under the GNU General Public License (GPL), version 2 Absolutely no warranty, see COPYING file for details. - + If your distro doesn't come with this file HTML: http://www.gnu.org/copyleft/gpl.html - Text: http://www.gnu.org/copyleft/gpl.txt + Text: http://www.gnu.org/copyleft/gpl.txt ------------------------------------------------------------------------- VERSION *vo-version* Version 0.3.4 - Released - + Released + Additions/changes: Added ,,cp which works like ,,c% but forces % signs to be added Color schemes have been added Checkboxes and hoisting default to 'on' Modified ,,cb and ,,c% (and ,,cp) to work only on headings Fixed the ,,cz command to make the correct call - Added descriptions of VO objects to help + Added descriptions of VO objects to help (headings, text, tables, etc.) Bug fixes: @@ -73,7 +73,7 @@ INSTALLING AND TESTING VIMOUTLINER *vo-install* Automatic method *vo-auto-install* The new automatic installation targets Unix-compatible - platforms. + platforms. $ tar xzvf vimoutliner-0.3.x.tar.gz $ cd vimoutliner $ sh install.sh @@ -102,7 +102,7 @@ INSTALLING AND TESTING VIMOUTLINER *vo-install* being replaced with newer versions. So if you put some local customisations into, say $HOME/.vimoutlinerrc, you'll probably have to merge the backup with the new file by hand. - + Manual method *vo-manual-install* @@ -110,11 +110,11 @@ INSTALLING AND TESTING VIMOUTLINER *vo-install* tarball into their destination folders by yourself. The following steps are a description of what has to go where and assume some knowledge of your vim setup. - + If you encounter problems, please contact the mailinglist for an immediate solution and more complete future documentation. www.lists.vimoutliner.org - + If you want to setup VimOutliner on a system running Microsoft Windows, the directory $HOME denotes the base folder of the vim installation. If you're on Unix based system, $HOME @@ -152,7 +152,7 @@ INSTALLING AND TESTING VIMOUTLINER *vo-install* Your $HOME/.vim/ftplugin/vo_base.vim file should contain the lines runtime! ftdetect/*.vim - + Finally, you need to integrate the online help provided with VimOutliner into the vim help system. Start vim and execute the following command: @@ -160,10 +160,10 @@ INSTALLING AND TESTING VIMOUTLINER *vo-install* At this point, VimOutliner should be functional. Type "help vo" to get started. - + Color Schemes *vo-color* - - Color schemes specify the colors Vim Outliner uses when + + Color schemes specify the colors Vim Outliner uses when displaying an outline. Colors are specified by object and level. These objects currently include: headings, body text, pre- formatted body text, tables and others. See |vo-objects| for @@ -176,14 +176,14 @@ INSTALLING AND TESTING VIMOUTLINER *vo-install* To override the default color scheme you can edit these lines in your $HOME/.vimoutlinerrc file: - + "Custom Colors ********************************** - " Uncomment this next line to force using VO on + " Uncomment this next line to force using VO on " a light background - " colorscheme vo_light - " Uncomment this next line to force using VO on + " colorscheme vo_light + " Uncomment this next line to force using VO on " a dark background - " colorscheme vo_dark + " colorscheme vo_dark To create your own scheme follow these simple steps: @@ -192,7 +192,7 @@ INSTALLING AND TESTING VIMOUTLINER *vo-install* 2. Make a copy of one of the included schemes to use as a starting point. You should be able to find them - in places like: $HOME/.vim/colors and + in places like: $HOME/.vim/colors and /usr/share/vim/vim63/colors. Put the copy in your own colors directory ($HOME/.vim/colors) @@ -239,9 +239,9 @@ INSTALLING AND TESTING VIMOUTLINER *vo-install* In $HOME/vo_test.otl Cursor to the _tag_newfile marker Press Ctrl+K - You should be brought to $HOME/vo_newfile.otl + You should be brought to $HOME/vo_newfile.otl Press Ctrl+N - You should be brought back to $HOME/vo_test.otl + You should be brought back to $HOME/vo_test.otl Note: Ctrl+K is a VimOutliner synonym for Ctrl+] Ctrl+N is a VimOutliner synonym for Ctrl+T @@ -263,7 +263,7 @@ USING VIMOUTLINER ON OTHER FILE TYPES *vo-other-files* VimOutliner. As of VimOutliner 0.3.0, the ol script is no longer necessary nor provided. Instead, VimOutliner is now a Vim plugin, so Vim does all the work. - + This makes VimOutliner much simpler to use in most cases, but Vim plugins are file extension based, meaning that if you want to use VimOutliner on a file extension other than @@ -316,7 +316,7 @@ VIMOUTLINER PHILOSOPHY *vo-philosophy* features as Grandview, More, Thinktank, Ecco, etc. Features include tree expand/collapse, tree promotion/demotion, level sensitive colors, interoutline linking, and body text. - + What sets VimOutliner apart from the rest is that it's been constructed from the ground up for fast and easy authoring. Keystrokes are quick and easy, especially for someone knowing the @@ -324,7 +324,7 @@ VIMOUTLINER PHILOSOPHY *vo-philosophy* to the extent that Vim supports the mouse). Many of the VimOutliner commands start with a double comma because that's very quick to type. - + Many outliners are prettier than VimOutliner. Most other outliners are more intuitive for the newbie not knowing Vim. Many outliners are more featureful than VimOutliner (although @@ -332,7 +332,7 @@ VIMOUTLINER PHILOSOPHY *vo-philosophy* Some outliners are faster on lookup than VimOutliner. But as far as we know, NO outliner is faster at getting information out of your mind and into an outline than VimOutliner. - + VimOutliner will always give you lightning fast authoring. That's our basic, underlying philosophy, and will never change, no matter what features are added. @@ -341,17 +341,17 @@ VIMOUTLINER PHILOSOPHY *vo-philosophy* Earlier VimOutliner versions prided themselves on being standalone applications, self-contained in a single directory with a special script to run everything. - + As of 0.3.0, VimOutliner is packaged as a Vim Plugin, eliminating the need for the ol script, which many saw as clumsy. Given that all VimOutliner features are produced by the Vim engine, it makes perfect sense to admit that VimOutliner is an add-on to Vim. - + Therefore VimOutliner now prides itself in being a Vim plugin. With the VimOutliner package installed, the Vim editor yields the VimOutliner feature set for files whose extensions are listed as vo_base types in $HOME/.vim/ftplugin/vo_base.vim. - + The Vim Plugin philosophy yields several benefits: Less reliance on Perl, bash and environment vars (upcoming) Portability between Linux, Windows and Mac @@ -367,13 +367,13 @@ RUNNING VIMOUTLINER *vo-running* characterwise, moving between command and insert modes, use of Visual Mode selections,and reformatting, you should be well equipped to use VimOutliner. - + VimOutliner is a set of Vim scripts and configurations. Its features all come from the Vim editor's engine. If you do not know Vim, you'll need to learn the Vim basics before using VimOutliner. Start by taking the Vim tutorial. The tutorial should take about 2 hours. - + VimOutliner is so fast, that if you often use outlining, you'll make up that time within a week. @@ -388,7 +388,7 @@ RUNNING VIMOUTLINER *vo-running* accessed through keyboard commands starting with 2 commas. The double comma followed by a character is incredibly fast to type. - + We expect to create more comma comma commands, so try not to create your own, as they may clash with later comma comma commands. If you have an exceptionally handy command, please @@ -505,16 +505,16 @@ RUNNING VIMOUTLINER *vo-running* The space before the exclamation point is a MUST. Menu *vo-menu* - + There is a simple menu included in Vim Outliner when running in GUI mode. Named 'VO', you can usually find it right next to the - 'Help' menu. There are commands to change the fold level and select + 'Help' menu. There are commands to change the fold level and select alternate color schemes. There is also entries for common tools. Currently there are only two entries for running the otl2html.py - script included with VO. - - The first otl2html.py tool item executes the script with default - options. The only control a user has it to modify the nnnnnn.css + script included with VO. + + The first otl2html.py tool item executes the script with default + options. The only control a user has it to modify the nnnnnn.css file. The second tool item calls a shell script, 'myotl2html.sh'. This @@ -522,7 +522,7 @@ RUNNING VIMOUTLINER *vo-running* releases. A sample myotl2html.sh script might look like this: #!/bin/bash - otl2html.py -S pjtstat.css $1 > $HOME/public_html/$1.html + otl2html.py -S pjtstat.css $1 > $HOME/public_html/$1.html If you have several different types of reports you create regularly, you can create your own menu entries. Just add lines like these to @@ -535,10 +535,10 @@ RUNNING VIMOUTLINER *vo-running* I'm sure you get the idea. Vim Outliner Objects *vo-objects* - + There are several object/line types that VO supports. The most common on simple headings and body text. Simple headings are - tab-indented line that start with any non-whitespace character + tab-indented line that start with any non-whitespace character except: : ; | < >. These characters specify other objects. Here is a list of each of the non-heading types: : body text (wrapping) @@ -546,12 +546,12 @@ RUNNING VIMOUTLINER *vo-running* | table > user-defined, text block (wrapping) < user-defined, preformatted text block (non-wrapping) - + The body text marker, :, is used to specify lines that are automatically wrapped and reformatted. VO and post-processors are free to wrap and reformat this text as well as use proportionally- spaced fonts. A post-processor will probably change the appearance - of what you have written. If you are writing a book or other + of what you have written. If you are writing a book or other document, most of the information you enter will be body text. Here is an example: @@ -563,31 +563,31 @@ RUNNING VIMOUTLINER *vo-running* : : His breeding is unknown. He appears to be a mix between : a german shepherd and a collie. - + When folded, body text looks something like this: Kirby the Wonder Dog [TEXT] -------------------------------- (6 lines) - + The preformatted text marker, ;, is used to mark text that should not be reformatted nor wrapped by VO or any post-processor. A post- - processor would use a fixed-space font, like courier, to render - these lines. A post-processor will probably not change the - appearance of what you have written. This is useful for making text + processor would use a fixed-space font, like courier, to render + these lines. A post-processor will probably not change the + appearance of what you have written. This is useful for making text picture, program code or other format-dependent text. Here is an example: Output waveform ; _______ ______ - ; _____/ \______________/ + ; _____/ \______________/ ; |-10us--|----35us------| - + When folded, preformatted body text looks something like this: Output waveform [TEXT BLOCK] -------------------------- (6 lines) - + The table marker, |, is used to create tables. This is an excellent way to show tabular data. The marker is used as if it were are real vertical line. A || (double-|) is optionally used to mark a table @@ -600,20 +600,20 @@ RUNNING VIMOUTLINER *vo-running* | Kirby | 9 | dog | both | | Hoover | 1 | dog | both | | Sophia | 9 | cat | inside | - + There is no automatic alignment of columns yet. It must be done manually. The post-processor, otl2thml.py, does have alignment functions. See its documentation for more information. - + When folded, a table looks something like this: Pets [TABLE] ------------------------------- (4 lines) - + User-defined text is similar to body text but more flexible and it's - use is not pre-defined by Vim Outliner. The basic, user-defined - text block marker, >, behaves just like body text. - + use is not pre-defined by Vim Outliner. The basic, user-defined + text block marker, >, behaves just like body text. + For example: Kirby the Wonder Dog @@ -623,110 +623,110 @@ RUNNING VIMOUTLINER *vo-running* > > His breeding is unknown. He appears to be a mix between > a german shepherd and a collie. - + When folded, body text looks something like this: Kirby the Wonder Dog [USER] -------------------------------- (6 lines) - + But unlike body text, user-defined text can be expanded. You could - have user-defined text types. If you were writing a book, in - addition to body text for paragraphs you might need special - paragraphs for tips and warnings. User-defined text blocks can + have user-defined text types. If you were writing a book, in + addition to body text for paragraphs you might need special + paragraphs for tips and warnings. User-defined text blocks can accomplish this: >Tips - > Don't forget to back up your computer daily. You don't - > need to back up the entire computer. You just need to + > Don't forget to back up your computer daily. You don't + > need to back up the entire computer. You just need to > backup up the files that have changed. >Warning - >Never store you backup floppy disks on the side of you + >Never store you backup floppy disks on the side of you >file cabinets by adhering them with magnets. - - A post processor will know how to remove the style tags (Tips and + + A post processor will know how to remove the style tags (Tips and Warning) and you want the text to be formatted. When folded, the above would appear as: [USER Tips] --------------------------- (4 lines) [USER Warning]------------------------- (3 lines) - + The user-defined, preformatted text block marker, <, behaves just like preformatted text. But like >, it leaves the functional - definition up to the user. A simple user-defined, preformatted text + definition up to the user. A simple user-defined, preformatted text block could be: Tux - < _.._ - < .-' `-. - < : ; - < ; ,_ _, ; - < : \{" "}/ : - < ,'.'"=..=''.'. - < ; / \ / \ ; - < .' ; '.__.' ; '. - < .-' .' '. '-. - < .' ; ; '. - < / / \ \ - < ; ; ; ; - < ; `-._ _.-' ; - < ; ""--. .--"" ; - < '. _ ; ; _ .' - < {""..' '._.-. .-._.' '..""} - < \ ; ; / - < : : : : - < : :.__.: : - < \ /"-..-"\ / fsc - < '-.__.' '.__.-' + < _.._ + < .-' `-. + < : ; + < ; ,_ _, ; + < : \{" "}/ : + < ,'.'"=..=''.'. + < ; / \ / \ ; + < .' ; '.__.' ; '. + < .-' .' '. '-. + < .' ; ; '. + < / / \ \ + < ; ; ; ; + < ; `-._ _.-' ; + < ; ""--. .--"" ; + < '. _ ; ; _ .' + < {""..' '._.-. .-._.' '..""} + < \ ; ; / + < : : : : + < : :.__.: : + < \ /"-..-"\ / fsc + < '-.__.' '.__.-' When folded it would be: Tux [USER BLOCK] -------------------------- (6 lines) - Like user-defined text, these blocks can be given user-defined + Like user-defined text, these blocks can be given user-defined styles. For example: > $homedir/.vimrc } -if [ $modified -eq 0 ] ; then - echo " not modified"; +if [ $modified -eq 0 ] ; then + echo " not modified"; else echo " modifying $homedir/.vimrc" fi @@ -96,7 +96,7 @@ modified=0 echo checking/creating/modifying $homedir/.vim/filetype.vim test -f $homedir/.vim/filetype.vim || \ { echo " creating $homedir/.vim/filetype.vim" - touch $homedir/.vim/filetype.vim + touch $homedir/.vim/filetype.vim } egrep -lq "runtime\! ftdetect/\*.vim" $homedir/.vim/filetype.vim || \ { echo " modifying $homedir/.vim/filetype.vim" @@ -126,9 +126,9 @@ cat < $TEMPTAGFILENAME"); + system("sort $TAGFILENAME | uniq > $TEMPTAGFILENAME"); system("rm $TAGFILENAME"); system("mv $TEMPTAGFILENAME $TAGFILENAME"); } @@ -112,7 +112,7 @@ ($$) { my($fileName) = $_[0]; my($processedFilesHashRef) = $_[1]; - + unless(fileExists($fileName)) { makeDirectory($fileName); @@ -223,7 +223,7 @@ ($) deriveAbsoluteFileName(getBaseDirectory($_[0]), $1); $tagString = ""; } - } + } return(%tags); } @@ -267,8 +267,8 @@ ($) } sub getFileNameOnly($) - { - my($fileString); + { + my($fileString); if ($_[0] =~ m/.+\/(.*)$/) { $fileString= $1 @@ -282,7 +282,7 @@ ($) } sub getBaseDirectory($) - { + { my($dirString) = ($_[0] =~ m/(.+\/).*$/); return $dirString; } @@ -294,7 +294,7 @@ ($$) my($passedFileName) = $_[1]; unless($baseDirectory =~ m/\/$/) { - $baseDirectory= $baseDirectory . "/"; + $baseDirectory= $baseDirectory . "/"; } if($passedFileName =~ m/^\//) { @@ -324,7 +324,7 @@ () print "\nUsage is:\n"; print "otltags topLevelOutlineFileName\n\n"; } - + makeTagFileStartingAt($ARGV[0]) diff --git a/bundle/vimoutliner/syntax/vo_base.vim b/bundle/vimoutliner/syntax/vo_base.vim index 52ff5c8..03af156 100644 --- a/bundle/vimoutliner/syntax/vo_base.vim +++ b/bundle/vimoutliner/syntax/vo_base.vim @@ -26,13 +26,13 @@ "# Set of outliner friendly settings "# Steve Litt, 5/28/2001 "# End of version 0.1.0 -"# +"# "# V0.1.1 Pre-alpha "# No change -"# +"# "# Steve Litt, 5/28/2001 "# End of version 0.1.1 -"# +"# "# V0.1.2 Pre-alpha "# No Change "# Steve Litt, 5/30/2001 @@ -41,14 +41,14 @@ "# No Change "# Steve Litt, 5/30/2001 "# End of version 0.1.3 -"# V0.2.0 +"# V0.2.0 "# Noel Henson adds code for outliner-friendly expand and "# collapse, comma comma commands, color coding, hooks for a "# spellchecker, sorting, and date insertion. "# Noel Henson, 11/24/2002 "# End of version 0.2.0 "# END OF HISTORY -"# +"# "######################################################################### " Level Colors {{{1 @@ -91,7 +91,7 @@ if &background == "light" hi PT8 guifg=darkblue ctermfg=cyan hi PT9 guifg=darkblue ctermfg=cyan - " color for tables + " color for tables hi TA1 guifg=darkviolet ctermfg=cyan hi TA2 guifg=darkviolet ctermfg=cyan hi TA3 guifg=darkviolet ctermfg=cyan @@ -133,7 +133,7 @@ if &background == "light" hi spellErr gui=underline guifg=darkred cterm=underline ctermfg=darkred hi BadWord gui=underline guifg=darkred cterm=underline ctermfg=darkred " Dark background {{{2 -else +else hi OL1 guifg=white ctermfg=white hi OL2 guifg=red ctermfg=red hi OL3 guifg=lightblue ctermfg=lightblue @@ -169,7 +169,7 @@ else hi PT8 guifg=darkblue ctermfg=cyan hi PT9 guifg=darkblue ctermfg=cyan - " color for tables + " color for tables hi TA1 guifg=darkviolet ctermfg=cyan hi TA2 guifg=darkviolet ctermfg=cyan hi TA3 guifg=darkviolet ctermfg=cyan diff --git a/bundle/vimoutliner/vimoutlinerrc b/bundle/vimoutliner/vimoutlinerrc index f5f8a71..bc13f9f 100644 --- a/bundle/vimoutliner/vimoutlinerrc +++ b/bundle/vimoutliner/vimoutlinerrc @@ -1,5 +1,5 @@ "Extra mappings ***************************************************** -"This mapping is fold-level and fold-state dependent +"This mapping is fold-level and fold-state dependent "map dd p "map dd P @@ -29,9 +29,9 @@ let g:hoistParanoia=0 "Custom Colors ****************************************************** " Uncomment this next line to force using VO on a light background -" colorscheme vo_light +" colorscheme vo_light " Uncomment this next line to force using VO on a dark background -" colorscheme vo_dark -" Or create your own color scheme. You can find sample files in Vim's +" colorscheme vo_dark +" Or create your own color scheme. You can find sample files in Vim's " colors directory. There may even be a colors directory in your own " $HOME/.vim directory. diff --git a/colors/molokai.vim b/colors/molokai.vim index cbe50e7..980b369 100644 --- a/colors/molokai.vim +++ b/colors/molokai.vim @@ -3,7 +3,7 @@ " Author: Tomas Restrepo " " Note: Based on the monokai theme for textmate -" by Wimer Hazenberg and its darker variant +" by Wimer Hazenberg and its darker variant " by Hamish Stuart Macpherson " diff --git a/vimrc b/vimrc index 58eeec4..e4cd2d6 100644 --- a/vimrc +++ b/vimrc @@ -98,7 +98,7 @@ let g:tagbar_left = 1 let g:tagbar_autoclose = 1 let g:tagbar_autofocus = 1 -"showmarks +"showmarks "let g:showmarks_enable = 0 let g:showmarks_include = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"