Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion bundle/bufexplorer/doc/bufexplorer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 16 additions & 16 deletions bundle/bufexplorer/plugin/bufexplorer.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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('<abuf>') + 0

if s:BEIgnoreBuffer(bufnr) == 1
return
return
else
let s:refreshBufferList = 1
endif
Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -308,7 +308,7 @@ function! s:BEIgnoreBuffer(buf)
return 1
end

return 0
return 0
endfunction

" BECleanup {{{1
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -658,7 +658,7 @@ function! s:BEBuildBufferList()
endif
endfor

if show_buffer == 0
if show_buffer == 0
continue
endif
endif
Expand Down Expand Up @@ -715,7 +715,7 @@ function! s:BESelectBuffer(...)
else
call WinManagerFileEdit(bufname, 0)
endif

return
endif

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions bundle/genutils/autoload/genutils.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions bundle/genutils/plugin/genutils.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(...)
" -----------------------
Expand Down Expand Up @@ -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()
" -----------------------
Expand Down Expand Up @@ -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)
" -----------------------
Expand Down Expand Up @@ -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()
" -----------------------
" -----------------------
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
Loading