Flush current state: rcfiles, vim plugins upd etc

This commit is contained in:
2013-07-31 22:37:06 +03:00
parent dfe983d3da
commit 82fd145215
12 changed files with 1417 additions and 1410 deletions

View File

@@ -9,6 +9,7 @@ application/x-shockwave-flash=chromium.desktop
x-scheme-handler/http=chromium.desktop
image/png=shotwell-viewer.desktop
image/jpeg=shotwell-viewer.desktop
image/gif=shotwell-viewer.desktop
[Default Applications]
text/html=chromium.desktop

2
.rc
View File

@@ -43,7 +43,7 @@ alias nc='nc -vv'
alias snc='openssl s_client -connect '
alias vsnc='openssl s_client -showcerts -state -msg -debug -connect '
alias killall='killall -v'
alias scrot='scrot -e "mv \$f ~/screenshots/ 2>/dev/null" -cd 5'
alias scrot='scrot -e "mv \$f ~/Pictures/ 2>/dev/null" -cd 5'
alias qiv='qiv -fml -M'
alias qivr='qiv -u'
alias grep='grep --line-buffered --color=auto'

12
.toprc
View File

@@ -1,14 +1,16 @@
top's Config File (Linux processes with windows)
Id:f, Mode_altscr=0, Mode_irixps=1, Delay_time=3.000, Curwin=0
Id:g, Mode_altscr=0, Mode_irixps=1, Delay_time=3.0, Curwin=0
Def fieldscur=¥¨³´»½ÀÄ·º¹Å&')*+,-./012568<>?ABCFGHIJKLMNOPQRSTUVWXYZ[
winflags=32564, sortindx=18, maxtasks=0
winflags=163636, sortindx=18, maxtasks=0
summclr=1, msgsclr=1, headclr=3, taskclr=2
Job fieldscur=¥¦¹·º³´Ä»¼½§Å()*+,-./012568>?@ABCFGHIJKLMNOPQRSTUVWXYZ[
winflags=62772, sortindx=0, maxtasks=0
winflags=193844, sortindx=0, maxtasks=0
summclr=6, msgsclr=6, headclr=7, taskclr=6
Mem fieldscur=¥º»¼½¾¿ÀÁÃij´·Å&'()*+,-./0125689BFGHIJKLMNOPQRSTUVWXYZ[
winflags=62772, sortindx=21, maxtasks=0
winflags=193844, sortindx=21, maxtasks=0
summclr=5, msgsclr=5, headclr=4, taskclr=5
Usr fieldscur=¥¦§¨ª°¹·ºÄÅ)+,-./1234568;<=>?@ABCFGHIJKLMNOPQRSTUVWXYZ[
winflags=62772, sortindx=3, maxtasks=0
winflags=193844, sortindx=3, maxtasks=0
summclr=3, msgsclr=3, headclr=2, taskclr=3
Fixed_widest=0, Summ_mscale=0, Task_mscale=0, Zero_suppress=0

File diff suppressed because it is too large Load Diff

View File

@@ -1 +1,2 @@
doc/tags
.netrwhist

View File

@@ -1,6 +1,6 @@
## About
[Vundle] is short for **V**imb**undle** and is a [Vim] plugin manager.
[Vundle] is short for _Vim bundle_ and is a [Vim] plugin manager.
![Vundle-installer](http://25.media.tumblr.com/tumblr_m8m96w06G81r39828o1_1280.png)
@@ -39,6 +39,8 @@
Bundle 'FuzzyFinder'
" non github repos
Bundle 'git://git.wincent.com/command-t.git'
" git repos on your local machine (ie. when working on your own plugin)
Bundle 'file:///Users/gmarik/path/to/plugin'
" ...
filetype plugin indent on " required!
@@ -90,11 +92,11 @@ see [`:h vundle`](vundle/blob/master/doc/vundle.txt#L1) vimdoc for more details.
## People Using Vundle
see [Examples](/gmarik/vundle/wiki/Examples)
see [Examples](https://github.com/gmarik/vundle/wiki/Examples)
## FAQ
see [wiki](/gmarik/vundle/wiki)
see [wiki](https://github.com/gmarik/vundle/wiki)
## Contributors
@@ -131,7 +133,7 @@ see [wiki](/gmarik/vundle/wiki)
[Vundle]:http://github.com/gmarik/vundle
[Pathogen]:http://github.com/tpope/vim-pathogen/
[Bundler]:http://github.com/wycats/bundler/
[Vim]:http://vim.org
[Vim]:http://www.vim.org
[Git]:http://git-scm.com
[all available vim scripts]:http://vim-scripts.org/vim/scripts.html

View File

@@ -25,6 +25,8 @@ com! -nargs=? -bang BundleClean
com! -nargs=0 BundleDocs
\ call vundle#installer#helptags(g:bundles)
" Aliases
com! BundleUpdate BundleInstall!
if (has('signs'))
sign define Vu_error text=! texthl=Error

View File

@@ -24,6 +24,9 @@ func! vundle#config#require(bundles) abort
endf
func! vundle#config#init_bundle(name, opts)
if a:name != substitute(a:name, '^\s*\(.\{-}\)\s*$', '\1', '')
echo "Spurious leading and/or trailing whitespace found in bundle spec '" . a:name . "'"
endif
let opts = extend(s:parse_options(a:opts), s:parse_name(substitute(a:name,"['".'"]\+','','g')))
let b = extend(opts, copy(s:bundle))
let b.rtpath = s:rtpath(opts)

View File

@@ -106,7 +106,10 @@ func! vundle#installer#install(bang, name) abort
endf
func! vundle#installer#docs() abort
call vundle#installer#helptags(g:bundles)
let error_count = vundle#installer#helptags(g:bundles)
if error_count > 0
return 'error'
endif
return 'helptags'
endf
@@ -117,11 +120,12 @@ func! vundle#installer#helptags(bundles) abort
call s:log('')
call s:log('Helptags:')
call map(copy(help_dirs), 's:helptags(v:val)')
let statuses = map(copy(help_dirs), 's:helptags(v:val)')
let errors = filter(statuses, 'v:val == 0')
call s:log('Helptags: '.len(help_dirs).' bundles processed')
return help_dirs
return len(errors)
endf
func! vundle#installer#list(bang) abort
@@ -198,10 +202,12 @@ func! s:helptags(rtp) abort
let doc_path = a:rtp.'/doc/'
call s:log(':helptags '.doc_path)
try
helptags `=doc_path`
execute 'helptags ' . doc_path
catch
call s:log("> Error running :helptags ".doc_path)
return 0
endtry
return 1
endf
func! s:sync(bang, bundle) abort
@@ -210,15 +216,13 @@ func! s:sync(bang, bundle) abort
if !(a:bang) | return 'todate' | endif
let cmd = 'cd '.shellescape(a:bundle.path()).' && git pull && git submodule update --init --recursive'
if (has('win32') || has('win64'))
let cmd = substitute(cmd, '^cd ','cd /d ','') " add /d switch to change drives
let cmd = '"'.cmd.'"' " enclose in quotes
endif
let cmd = g:shellesc_cd(cmd)
let get_current_sha = 'cd '.shellescape(a:bundle.path()).' && git rev-parse HEAD'
let get_current_sha = g:shellesc_cd(get_current_sha)
let initial_sha = s:system(get_current_sha)[0:15]
else
let cmd = 'git clone --recursive '.a:bundle.uri.' '.shellescape(a:bundle.path())
let cmd = 'git clone --recursive '.shellescape(a:bundle.uri).' '.shellescape(a:bundle.path())
let initial_sha = ''
endif
@@ -246,6 +250,25 @@ func! s:sync(bang, bundle) abort
return 'updated'
endf
func! g:shellesc(cmd) abort
if (has('win32') || has('win64'))
if &shellxquote != '(' " workaround for patch #445
return '"'.a:cmd.'"' " enclose in quotes so && joined cmds work
endif
endif
return a:cmd
endf
func! g:shellesc_cd(cmd) abort
if (has('win32') || has('win64'))
let cmd = substitute(a:cmd, '^cd ','cd /d ','') " add /d switch to change drives
let cmd = g:shellesc(cmd)
return cmd
else
return a:cmd
endif
endf
func! s:system(cmd) abort
return system(a:cmd)
endf

View File

@@ -28,7 +28,7 @@ func! s:view_log()
endif
call writefile(g:vundle_log, g:vundle_log_file)
silent pedit `=g:vundle_log_file`
execute 'silent pedit ' . g:vundle_log_file
wincmd P | wincmd H
endf
@@ -43,10 +43,7 @@ func! s:create_changelog() abort
\ ' && git log --pretty=format:"%s %an, %ar" --graph '.
\ initial_sha.'..'.updated_sha
if (has('win32') || has('win64'))
let cmd = substitute(cmd, '^cd ','cd /d ','') " add /d switch to change drives
let cmd = '"'.cmd.'"' " enclose in quotes
endif
let cmd = g:shellesc_cd(cmd)
let updates = system(cmd)
@@ -72,7 +69,7 @@ func! s:view_changelog()
endif
call writefile(g:vundle_changelog, g:vundle_changelog_file)
silent pedit `=g:vundle_changelog_file`
execute 'silent pedit ' . g:vundle_changelog_file
wincmd P | wincmd H
endf
@@ -164,7 +161,7 @@ func! s:fetch_scripts(to)
let cmd = 'wget -q -O '.temp.' '.l:vim_scripts_json. ' && mv -f '.temp.' '.shellescape(a:to)
if (has('win32') || has('win64'))
let cmd = substitute(cmd, 'mv -f ', 'move /Y ', '') " change force flag
let cmd = '"'.cmd.'"' " enclose in quotes so && joined cmds work
let cmd = g:shellesc(cmd)
end
else
echoerr 'Error curl or wget is not available!'

View File

@@ -73,6 +73,8 @@ in order to install/search [all available vim scripts]
Bundle 'rails.vim'
" non github repos
Bundle 'git://git.wincent.com/command-t.git'
" git repos on your local machine (ie. when working on your own plugin)
Bundle 'file:///Users/gmarik/path/to/plugin'
" ...
filetype plugin indent on " required!

View File

@@ -1,4 +1,4 @@
# This file was generated by Zandronum 1.0 on Sun Mar 24 12:44:33 2013
# This file was generated by Zandronum 1.0 on Wed Jun 26 13:14:31 2013
# These are the directories to automatically search for IWADs.
# Each directory should be on a separate line, preceded by Path=
@@ -113,6 +113,8 @@ sdl_nokeyrepeat=false
m_filter=false
m_noprescale=false
use_mouse=true
gl_vid_allowsoftware=false
gl_vid_multisample=0
bgamma=1
ggamma=1
rgamma=1
@@ -178,10 +180,50 @@ crosshairscale=false
crosshairhealth=true
crosshaircolor=ff 00 00
crosshair=2
gl_usearrays=false
gl_texture_hqresize_targets=7
gl_texture_hqresize_maxinputsize=512
gl_texture_hqresize=0
gl_distfog=70
gl_lights_additive=false
gl_light_ambient=20
gl_light_particles=true
gl_light_sprites=true
gl_lights_size=1
gl_lights_intensity=1
gl_lights_checkside=true
gl_bulletlight=true
gl_attachedlights=true
gl_lights=true
vid_contrast=1
vid_brightness=0.3
gl_nearclip=5
gl_vid_compatibility=false
gl_nogl=false
gl_plane_reflection=true
r_mirror_recursions=4
gl_blendcolormaps=true
gl_mask_threshold=0.5
gl_nearclip=5
gl_no_skyclear=false
gl_glow_shader=false
gl_brightmap_shader=false
gl_colormap_shader=false
gl_fog_shader=false
gl_warp_shader=false
gl_sky_detail=16
gl_billboard_mode=0
gl_particles_style=2
gl_sprite_blend=false
gl_usecolorblending=true
gl_clamp_per_texture=false
gl_texture_format=0
gl_texture_filter=2
gl_texture_filter_anisotropic=1
gl_render_precise=false
gl_fakecontrast=true
gl_seamless=false
gl_render_segs=false
gl_mirror_envmap=true
snd_waterlp=250
snd_midipatchset=
snd_output_format=PCM-16
@@ -222,47 +264,6 @@ midi_voices=32
midi_config=timidity.cfg
[GlobalSettings.Unknown]
gl_mirror_envmap=true
gl_render_segs=false
gl_seamless=false
gl_fakecontrast=true
gl_render_precise=false
gl_texture_filter_anisotropic=1
gl_texture_filter=2
gl_texture_format=0
gl_clamp_per_texture=false
gl_usecolorblending=true
gl_sprite_blend=false
gl_particles_style=2
gl_billboard_mode=0
gl_sky_detail=16
gl_warp_shader=false
gl_fog_shader=false
gl_colormap_shader=false
gl_brightmap_shader=false
gl_glow_shader=false
gl_no_skyclear=false
gl_mask_threshold=0.5
gl_blendcolormaps=true
r_mirror_recursions=4
gl_plane_reflection=true
gl_lights=true
gl_attachedlights=true
gl_bulletlight=true
gl_lights_checkside=true
gl_lights_intensity=1
gl_lights_size=1
gl_light_sprites=true
gl_light_particles=true
gl_light_ambient=20
gl_lights_additive=false
gl_distfog=70
gl_texture_hqresize=0
gl_texture_hqresize_maxinputsize=512
gl_texture_hqresize_targets=7
gl_usearrays=false
gl_vid_multisample=0
gl_vid_allowsoftware=false
[Doom.Player]
cl_ticsperupdate=3
@@ -547,7 +548,15 @@ blood_fade_scalar=0.5
cl_identifytarget=true
st_scale=true
cl_drawcoopinfo=true
gl_lightmode=3
gl_fogmode=1
gl_enhanced_nightvision=true
gl_weaponlight=8
gl_use_models=true
gl_interpolate_model_frames=true
gl_spriteclip=2
gl_precache=true
gl_texture_usehires=true
snd_pitched=false
[Doom.LocalServerInfo]
@@ -560,23 +569,14 @@ sv_corpsequeuesize=64
maxviewpitch=90
[Doom.UnknownConsoleVariables]
maxviewpitch=90
gl_texture_usehires=true
gl_spriteclip=2
gl_interpolate_model_frames=true
gl_use_models=true
gl_weaponlight=8
gl_enhanced_nightvision=true
gl_fogmode=1
gl_lightmode=3
samsara_cl_printpickup=0
samsara_cl_pickupmode=1
samsara_cl_moremessages=0
samsara_cl_ballgag=0
samsara_cl_weaponhud=1
samsara_cl_vanilladoom=0
samsara_cl_wolfmove=0
samsara_cl_exists=2601
samsara_cl_wolfmove=0
samsara_cl_vanilladoom=0
samsara_cl_weaponhud=1
samsara_cl_ballgag=0
samsara_cl_moremessages=0
samsara_cl_pickupmode=1
samsara_cl_printpickup=0
[Doom.ConsoleAliases]