Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of github.com:lilydjwg/dotvim

  • Loading branch information...
commit fd2511774c6bedd4c8eeb7b3c1b932002cef2099 2 parents 8b38685 + 94fcb3e
依云 authored

Showing 1 changed file with 16 additions and 18 deletions. Show diff stats Hide diff stats

  1. +16 18 vimrc
34 vimrc
@@ -476,15 +476,7 @@ end
476 476 if has("win32") || has("win64")
477 477 let g:LustyExplorerSuppressRubyWarning = 1
478 478 " Win 路径 [[[3
479   - let g:VEConf_favorite = expand("$VIM/vimfiles/ve_favorite")
480   - let g:NERDTreeBookmarksFile = expand("$VIM/vimfiles/NERDTreeBookmarks")
481   - let g:undodir = expand("$TMP/vimundo")
482   - let g:vimfiles = expand("$VIM/vimfiles")
483   - let g:dictfilePrefix = expand('$VIM/vimfiles/dict/')
484   - set errorfile=$TMP/.error
485   - if has("python3")
486   - py3file $VIM/vimfiles/vimrc.py
487   - endif
  479 + let g:mytmpdir = $TMP
488 480 " Win 程序 [[[3
489 481 " 用默认的程序打开文件
490 482 nmap <C-S-F5> :!"%"<CR>
@@ -496,21 +488,17 @@ if has("win32") || has("win64")
496 488 command Fscreen simalt ~r
497 489 else
498 490 " Linux 路径 [[[3
499   - let g:VEConf_favorite = expand("~/.vim/ve_favorite")
500   - let g:NERDTreeBookmarksFile = expand("~/.vim/NERDTreeBookmarks")
501   - let g:undodir = expand("~/tmpfs/.vimundo")
502   - let g:vimfiles = expand("~/.vim")
503   - let g:dictfilePrefix = expand('~/.vim/dict/')
504   - set errorfile=~/tmpfs/.error
  491 + if exists('$VIMTMP')
  492 + let g:mytmpdir = $VIMTMP
  493 + else
  494 + let g:mytmpdir = expand("~/tmpfs")
  495 + endif
505 496 let my_diary_file = expand('~/secret/diary/2013.rj')
506 497 let g:MuttVim_configfile = expand('~/scripts/python/pydata/muttvim.json')
507 498 cmap <C-T> ~/tmpfs/
508 499 " cron 的目录不要备份
509 500 set backupskip+=/etc/cron.*/*
510 501 set backupdir=.,~/temp,/tmp
511   - if has("python3")
512   - py3file ~/.vim/vimrc.py
513   - endif
514 502 " Linux 程序 [[[3
515 503 " 用默认的程序打开文件
516 504 nmap <C-S-F5> :!gnome-open "%"<CR>
@@ -530,6 +518,16 @@ if $LANGUAGE =~ '^zh' || ($LANGUAGE == '' && v:lang =~ '^zh')
530 518 else
531 519 set statusline=%n\ %<%f\ %LL\ %{&modified?'[+]':&modifiable\|\|&ft=~'^\\vhelp\|qf$'?'':'[-]'}%h%r%{&fenc=='utf-8'\|\|&fenc==''?'':'['.&fenc.']'}%{&ff=='unix'?'':'['.&ff.']'}%{&bomb?'[BOM]':''}%{&eol?'':'[noeol]'}%=\ 0x%-4.8B\ \ \ \ %-14.(%l,%c%V%)\ %P
532 520 endif
  521 +" 路径相关 [[[3split(&runtimepath, ',')[0]
  522 +let g:vimfiles = split(&runtimepath, ',')[0]
  523 +let g:VEConf_favorite = g:vimfiles . "/ve_favorite"
  524 +let g:NERDTreeBookmarksFile = g:vimfiles . "/NERDTreeBookmarks"
  525 +let g:dictfilePrefix = g:vimfiles . "/dict/"
  526 +if has("python3")
  527 + exe "py3file" g:vimfiles . "/vimrc.py"
  528 +endif
  529 +let g:undodir = g:mytmpdir . "/.vimundo"
  530 +let &errorfile= g:mytmpdir . "/.error"
533 531 " 图形与终端 [[[2
534 532 let colorscheme = 'lilypink'
535 533 if has("gui_running")

0 comments on commit fd25117

Please sign in to comment.
Something went wrong with that request. Please try again.