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
4 changes: 2 additions & 2 deletions .dircolors
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ EIGHTBIT 1

# Below are the color init strings for the basic file types. A color init
# string consists of one or more of the following numeric codes:
# Attribute codes:
# Attribute codes:
# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
# Text color codes:
# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
Expand All @@ -66,7 +66,7 @@ ORPHAN 01;05;37;41 # orphaned syminks
MISSING 01;05;37;41 # ... and the files they point to

# This is for files with execute permission:
EXEC 01;32
EXEC 01;32

# List any file extensions like '.gz' or '.tar' that you would like ls
# to colorize below. Put the extension, a space, and the color init string.
Expand Down
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
*.pyc

# Logs and databases #
######################
*.log

# OS generated files #
######################
.DS_Store*
ehthumbs.db
Icon?
Thumbs.db
6 changes: 3 additions & 3 deletions .screenrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ vbell_msg " Wuff ---- Wuff!! "
# all termcap entries are now duplicated as terminfo entries.
# only difference should be the slightly modified syntax, and check for
# terminfo entries, that are already corected in the database.
#
#
# G0 we have a SEMI-GRAPHICS-CHARACTER-MODE
# WS this sequence resizes our window.
# cs this sequence changes the scrollregion
Expand Down Expand Up @@ -70,7 +70,7 @@ termcap xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
terminfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'

#
# Do not use xterms alternate window buffer.
# Do not use xterms alternate window buffer.
# This one would not add lines to the scrollback buffer.
#termcap xterm|xterms|xs ti=\E7\E[?47l
#terminfo xterm|xterms|xs ti=\E7\E[?47l
Expand Down Expand Up @@ -269,7 +269,7 @@ hardstatus alwayslastline '%{bW}%-w%{.wB}%n %t%{-}%+w %=%{.w}'

############################# xp add #################################
#chdir /home/xp/temp
#screen -t toy
#screen -t toy
#screen -t editor cd data/temp
#screen -t network cd software
#screen -t toy cd /
Expand Down
72 changes: 36 additions & 36 deletions .vim/autoload/javascriptcomplete.vim
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
let maths = mathprop + mathmeth

" Number
let numbprop = ['MAX_VALUE', 'MIN_VALUE', 'NaN', 'NEGATIVE_INFINITY', 'POSITIVE_INFINITY',
let numbprop = ['MAX_VALUE', 'MIN_VALUE', 'NaN', 'NEGATIVE_INFINITY', 'POSITIVE_INFINITY',
\ 'constructor', 'prototype']
let numbmeth = ['toExponential', 'toFixed', 'toPrecision', 'toSource', 'toString', 'valueOf',
\ 'watch', 'unwatch']
Expand Down Expand Up @@ -176,7 +176,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
let formmeth = ['reset', 'submit', 'onReset', 'onSubmit']
call map(formmeth, 'v:val."("')
let forms = formprop + formmeth

"YAHOO
let yahooprop = ['util', 'widget', 'Tools']
call map(yahooprop, 'v:val."."')
Expand All @@ -194,16 +194,16 @@ function! javascriptcomplete#CompleteJS(findstart, base)

call map(yahooudmeth, 'v:val."("')
let yahooutildom = yahooudmeth

"YAHOO.util.Event
let yahoouemeth = ['addListener', 'clearCache', 'fireLegacyEvent', 'generateId', 'getCharCode', 'getEl', 'getEvent', 'getLegacyIndex',
\ 'getListeners', 'getPageX', 'getPageY', 'getRelatedTarget', 'getTarget', 'getTime', 'getXY', 'on', 'onAvailable',
\ 'onContentReady', 'preventDefault', 'purgeElement', 'removeListener', 'resolveTextNode', 'startInterval', 'stopEvent',
let yahoouemeth = ['addListener', 'clearCache', 'fireLegacyEvent', 'generateId', 'getCharCode', 'getEl', 'getEvent', 'getLegacyIndex',
\ 'getListeners', 'getPageX', 'getPageY', 'getRelatedTarget', 'getTarget', 'getTime', 'getXY', 'on', 'onAvailable',
\ 'onContentReady', 'preventDefault', 'purgeElement', 'removeListener', 'resolveTextNode', 'startInterval', 'stopEvent',
\ 'stopPropagation', 'useLegacyEvent']

call map(yahoouemeth, 'v:val."("')
let yahooutilevent = yahoouemeth

"YAHOO.util.Anim
let yahoouameth = ['animate', 'doMethod', 'getAttribute', 'getDefaultUnit', 'getEl', 'getStartTime', 'init', 'isAnimated', 'onTween', 'setAttribute', 'stop', 'toString', 'onComplete', 'onStart', 'onTween']
call map(yahoouameth, 'v:val."("')
Expand All @@ -213,8 +213,8 @@ function! javascriptcomplete#CompleteJS(findstart, base)

" YAHOO.Tools
let yahootoolsmeth = ['getHeight', 'getCenter', 'makeTextObject', 'makeChildren', 'styleToCamel', 'removeQuotes', 'trim', 'stripTags', 'hasBRs',
\ 'convertBRs2NLs', 'stringRepeat', 'stringReverse', 'printf', 'setStyleString', 'getSelection', 'removeElement', 'setCookie', 'getCookie',
\ 'deleteCookie', 'getBrowserEngine', 'getBrowserAgent', 'checkFlash', 'setAttr', 'create', 'insertAfter', 'inArray', 'checkBoolean', 'checkNumber',
\ 'convertBRs2NLs', 'stringRepeat', 'stringReverse', 'printf', 'setStyleString', 'getSelection', 'removeElement', 'setCookie', 'getCookie',
\ 'deleteCookie', 'getBrowserEngine', 'getBrowserAgent', 'checkFlash', 'setAttr', 'create', 'insertAfter', 'inArray', 'checkBoolean', 'checkNumber',
\ 'PixelToEm', 'PixelToEmStyle', 'base64Encode', 'base64Decode', 'getQueryString']
call map(yahootoolsmeth, 'v:val."("')
let yahootools = yahootoolsmeth
Expand Down Expand Up @@ -254,50 +254,50 @@ function! javascriptcomplete#CompleteJS(findstart, base)
call map(buttmeth, 'v:val."("')
let butts = buttprop + buttmeth
" Checkbox - accessible only by other properties
let checprop = ['accept', 'accessKey', 'align', 'alt', 'checked', 'defaultChecked',
\ 'disabled', 'form', 'id', 'name', 'tabIndex', 'type', 'value']
let checprop = ['accept', 'accessKey', 'align', 'alt', 'checked', 'defaultChecked',
\ 'disabled', 'form', 'id', 'name', 'tabIndex', 'type', 'value']
let checmeth = ['blur', 'click', 'focus', 'onBlur', 'onClick', 'onFocus', 'onMouseDown', 'onMouseUp']
call map(checmeth, 'v:val."("')
let checs = checprop + checmeth
" File upload - accessible only by other properties
let fileprop = ['accept', 'accessKey', 'align', 'alt', 'defaultValue',
\ 'disabled', 'form', 'id', 'name', 'tabIndex', 'type', 'value']
let fileprop = ['accept', 'accessKey', 'align', 'alt', 'defaultValue',
\ 'disabled', 'form', 'id', 'name', 'tabIndex', 'type', 'value']
let filemeth = ['blur', 'focus', 'onBlur', 'onClick', 'onFocus', 'onMouseDown', 'onMouseUp']
call map(filemeth, 'v:val."("')
let files = fileprop + filemeth
" Hidden - accessible only by other properties
let hiddprop = ['defaultValue', 'form', 'id', 'name', 'type', 'value']
let hiddprop = ['defaultValue', 'form', 'id', 'name', 'type', 'value']
let hidds = hiddprop
" Password - accessible only by other properties
let passprop = ['accept', 'accessKey', 'defaultValue',
\ 'disabled', 'form', 'id', 'maxLength', 'name', 'readOnly', 'size', 'tabIndex',
\ 'type', 'value']
let passmeth = ['blur', 'click', 'focus', 'select', 'onBlur', 'onFocus', 'onKeyDown',
let passprop = ['accept', 'accessKey', 'defaultValue',
\ 'disabled', 'form', 'id', 'maxLength', 'name', 'readOnly', 'size', 'tabIndex',
\ 'type', 'value']
let passmeth = ['blur', 'click', 'focus', 'select', 'onBlur', 'onFocus', 'onKeyDown',
\ 'onKeyPress', 'onKeyUp']
call map(passmeth, 'v:val."("')
let passs = passprop + passmeth
" Radio - accessible only by other properties
let radiprop = ['accept', 'accessKey', 'align', 'alt', 'checked', 'defaultChecked',
\ 'disabled', 'form', 'id', 'name', 'tabIndex', 'type', 'value']
let radiprop = ['accept', 'accessKey', 'align', 'alt', 'checked', 'defaultChecked',
\ 'disabled', 'form', 'id', 'name', 'tabIndex', 'type', 'value']
let radimeth = ['blur', 'click', 'focus', 'select', 'onBlur', 'onFocus']
call map(radimeth, 'v:val."("')
let radis = radiprop + radimeth
" Reset - accessible only by other properties
let reseprop = ['accept', 'accessKey', 'align', 'alt', 'defaultValue',
\ 'disabled', 'form', 'id', 'name', 'size', 'tabIndex', 'type', 'value']
let reseprop = ['accept', 'accessKey', 'align', 'alt', 'defaultValue',
\ 'disabled', 'form', 'id', 'name', 'size', 'tabIndex', 'type', 'value']
let resemeth = ['blur', 'click', 'focus', 'select', 'onBlur', 'onFocus']
call map(resemeth, 'v:val."("')
let reses = reseprop + resemeth
" Submit - accessible only by other properties
let submprop = ['accept', 'accessKey', 'align', 'alt', 'defaultValue',
\ 'disabled', 'form', 'id', 'name', 'size', 'tabIndex', 'type', 'value']
let submprop = ['accept', 'accessKey', 'align', 'alt', 'defaultValue',
\ 'disabled', 'form', 'id', 'name', 'size', 'tabIndex', 'type', 'value']
let submmeth = ['blur', 'click', 'focus', 'select', 'onClick', 'onSelectStart']
call map(submmeth, 'v:val."("')
let subms = submprop + submmeth
" Text - accessible only by other properties
let textprop = ['accept', 'accessKey', 'align', 'alt', 'defaultValue',
\ 'disabled', 'form', 'id', 'maxLength', 'name', 'readOnly',
\ 'size', 'tabIndex', 'type', 'value']
let textprop = ['accept', 'accessKey', 'align', 'alt', 'defaultValue',
\ 'disabled', 'form', 'id', 'maxLength', 'name', 'readOnly',
\ 'size', 'tabIndex', 'type', 'value']
let textmeth = ['blur', 'focus', 'select', 'onBlur', 'onChange', 'onFocus', 'onKeyDown',
\ 'onKeyPress', 'onKeyUp', 'onSelect']
call map(textmeth, 'v:val."("')
Expand Down Expand Up @@ -329,15 +329,15 @@ function! javascriptcomplete#CompleteJS(findstart, base)
\ 'type', 'useMap', 'vspace', 'width']
let objes = objeprop
" Option - accessible only by other properties
let optiprop = ['defaultSelected',
let optiprop = ['defaultSelected',
\ 'disabled', 'form', 'id', 'index', 'label', 'selected', 'text', 'value']
let optis = optiprop
" Screen - screen.
let screprop = ['availHeight', 'availWidth', 'colorDepth', 'height', 'width']
let scres = screprop
" Select - accessible only by other properties
let seleprop = ['options', 'disabled', 'form', 'id', 'length', 'multiple', 'name',
\ 'selectedIndex', 'size', 'tabIndex', 'type', 'value']
let seleprop = ['options', 'disabled', 'form', 'id', 'length', 'multiple', 'name',
\ 'selectedIndex', 'size', 'tabIndex', 'type', 'value']
let selemeth = ['blur', 'focus', 'remove', 'onBlur', 'onChange', 'onFocus']
call map(selemeth, 'v:val."("')
let seles = seleprop + selemeth
Expand Down Expand Up @@ -384,9 +384,9 @@ function! javascriptcomplete#CompleteJS(findstart, base)
call map(trowmeth, 'v:val."("')
let trows = trowprop + trowmeth
" Textarea - accessible only by other properties
let tareprop = ['accessKey', 'cols', 'defaultValue',
\ 'disabled', 'form', 'id', 'name', 'readOnly', 'rows',
\ 'tabIndex', 'type', 'value', 'selectionStart', 'selectionEnd']
let tareprop = ['accessKey', 'cols', 'defaultValue',
\ 'disabled', 'form', 'id', 'name', 'readOnly', 'rows',
\ 'tabIndex', 'type', 'value', 'selectionStart', 'selectionEnd']
let taremeth = ['blur', 'focus', 'select', 'onBlur', 'onChange', 'onFocus']
call map(taremeth, 'v:val."("')
let tares = tareprop + taremeth
Expand All @@ -411,7 +411,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
" Attributes - element.attributes[x].
let xdomattrprop = ['name', 'specified', 'value']
" Element - anyelement.
let xdomelemprop = ['attributes', 'childNodes', 'firstChild', 'lastChild',
let xdomelemprop = ['attributes', 'childNodes', 'firstChild', 'lastChild',
\ 'namespaceURI', 'nextSibling', 'nodeName', 'nodeType', 'nodeValue',
\ 'ownerDocument', 'parentNode', 'prefix', 'previousSibling', 'tagName']
let xdomelemmeth = ['appendChild', 'cloneNode', 'getAttribute', 'getAttributeNode',
Expand All @@ -421,14 +421,14 @@ function! javascriptcomplete#CompleteJS(findstart, base)
call map(xdomelemmeth, 'v:val."("')
let xdomelems = xdomelemprop + xdomelemmeth
" Node - anynode.
let xdomnodeprop = ['attributes', 'childNodes', 'firstChild', 'lastChild',
let xdomnodeprop = ['attributes', 'childNodes', 'firstChild', 'lastChild',
\ 'namespaceURI', 'nextSibling', 'nodeName', 'nodeType', 'nodeValue',
\ 'ownerDocument', 'parentNode', 'prefix', 'previousSibling']
let xdomnodemeth = ['appendChild', 'cloneNode',
\ 'hasChildNodes', 'insertBefore', 'removeChild', 'replaceChild']
call map(xdomnodemeth, 'v:val."("')
let xdomnodes = xdomnodeprop + xdomnodemeth
" NodeList
" NodeList
let xdomnliss = ['length', 'item(']
" Error - parseError.
let xdomerror = ['errorCode', 'reason', 'line', 'linepos', 'srcText', 'url', 'filepos']
Expand Down
8 changes: 4 additions & 4 deletions .vim/autoload/pythoncomplete.vim
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class Completer(object):
if type(func_obj) == types.ClassType: func_obj = _ctor(func_obj)
elif type(func_obj) == types.MethodType: func_obj = func_obj.im_func
else: arg_offset = 0

arg_text=''
if type(func_obj) in [types.FunctionType, types.LambdaType]:
try:
Expand Down Expand Up @@ -453,7 +453,7 @@ class PyParser:
def _parseassignment(self):
assign=''
tokentype, token, indent = self.next()
if tokentype == tokenize.STRING or token == 'str':
if tokentype == tokenize.STRING or token == 'str':
return '""'
elif token == '(' or token == 'tuple':
return '()'
Expand Down Expand Up @@ -550,7 +550,7 @@ class PyParser:
continue
freshscope = True
self.scope = self.scope.add(cls)

elif token == 'import':
imports = self._parseimportlist()
for mod, alias in imports:
Expand All @@ -572,7 +572,7 @@ class PyParser:
elif tokentype == STRING:
if freshscope: self.scope.doc(token)
elif tokentype == NAME:
name,token = self._parsedotname(token)
name,token = self._parsedotname(token)
if token == '=':
stmt = self._parseassignment()
dbg("parseassignment: %s = %s" % (name, stmt))
Expand Down
14 changes: 7 additions & 7 deletions .vim/autoload/vimball.vim
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,15 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
while linenr <= a:line2
let svfile = getline(linenr)
" call Decho("svfile<".svfile.">")

if !filereadable(svfile)
call vimball#ShowMesg(s:ERROR,"unable to read file<".svfile.">")
call s:ChgDir(curdir)
call vimball#RestoreSettings()
" call Dret("MkVimball")
return
endif

" create/switch to mkvimball tab
if !exists("vbtabnr")
tabnew
Expand All @@ -157,7 +157,7 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
else
exe "tabn ".vbtabnr
endif

let lastline= line("$") + 1
if lastline == 2 && getline("$") == ""
call setline(1,'" Vimball Archiver by Charles E. Campbell, Jr., Ph.D.')
Expand Down Expand Up @@ -210,7 +210,7 @@ endfun

" ---------------------------------------------------------------------
" vimball#Vimball: extract and distribute contents from a vimball {{{2
" (invoked the the UseVimball command embedded in
" (invoked the the UseVimball command embedded in
" vimballs' prologue)
fun! vimball#Vimball(really,...)
" call Dfunc("vimball#Vimball(really=".a:really.") a:0=".a:0)
Expand Down Expand Up @@ -257,7 +257,7 @@ fun! vimball#Vimball(really,...)
" give title to listing of (extracted) files from Vimball Archive
if a:really
echohl Title | echomsg "Vimball Archive" | echohl None
else
else
echohl Title | echomsg "Vimball Archive Listing" | echohl None
echohl Statement | echomsg "files would be placed under: ".home | echohl None
endif
Expand Down Expand Up @@ -426,7 +426,7 @@ fun! vimball#RmVimball(...)
if filereadable(".VimballRecord")
" call Decho(".VimballRecord is readable")
" call Decho("curfile<".curfile.">")
keepalt keepjumps 1split
keepalt keepjumps 1split
silent! keepalt keepjumps e .VimballRecord
let keepsrch= @/
" call Decho("search for ^".curfile.".vba:")
Expand Down Expand Up @@ -622,7 +622,7 @@ fun! s:RecordInFile(home)
if exists("s:recordfile") || exists("s:recorddir")
let curdir= getcwd()
call s:ChgDir(a:home)
keepalt keepjumps 1split
keepalt keepjumps 1split

let cmd= expand("%:tr").": "
" call Decho("cmd<".cmd.">")
Expand Down
2 changes: 1 addition & 1 deletion .vim/colors/darkbluefix.vim
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let colors_name = "darkbluefix"

hi TabLine cterm=none ctermfg=lightgrey ctermbg=lightblue guifg=gray guibg=black
hi TabLineSel cterm=none ctermfg=lightgrey ctermbg=LightMagenta guifg=white guibg=black
hi TabLineFill cterm=none ctermfg=lightblue ctermbg=lightblue guifg=black guibg=black
hi TabLineFill cterm=none ctermfg=lightblue ctermbg=lightblue guifg=black guibg=black

hi Normal guifg=#c0c0c0 guibg=#000040 ctermfg=gray ctermbg=black
hi ErrorMsg guifg=#ffffff guibg=#287eff ctermfg=white ctermbg=lightblue
Expand Down
2 changes: 1 addition & 1 deletion .vim/doc/autocmd.cnx
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ CursorHold 用户在 'updatetime' 指定的时间里没有按键时。如
注意: 将来设定时间可能有别的选项。
提示: 要强制更新状态行,用: >
:let &ro = &ro
< {仅在 Amiga、Unix、Win32、MSDOS 和所有的 GUI
< {仅在 Amiga、Unix、Win32、MSDOS 和所有的 GUI
版本上有效}
*CursorHoldI*
CursorHoldI 类似于 CursorHold,但用于插入模式。
Expand Down
Loading