summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreas@tuxedo-six2018-01-12 17:35:50 +0100
committerandreas@tuxedo-six2018-01-12 17:35:50 +0100
commita7b914648a1afcf8e1b19d4365cf382df4e6d551 (patch)
tree3fa3c4cb424111587c9214dc5092f88036556778
parent68e8ca58182738040fe80d8f50c33571b419f0c5 (diff)
downloaddotfiles-a7b914648a1afcf8e1b19d4365cf382df4e6d551.zip
dotfiles-a7b914648a1afcf8e1b19d4365cf382df4e6d551.tar.gz
Merged-in old vi config from 'webftp'.
-rw-r--r--src/vi/_gvimrc3
-rw-r--r--src/vi/_vimrc9
2 files changed, 6 insertions, 6 deletions
diff --git a/src/vi/_gvimrc b/src/vi/_gvimrc
index 43af3d0..77d17c7 100644
--- a/src/vi/_gvimrc
+++ b/src/vi/_gvimrc
@@ -2,7 +2,8 @@
set lines=35 columns=100
if has("win32")
- set guifont=Consolas:h11:cANSI
+ set guifont=DejaVu_Sans_Mono:h11:cANSI
+" set guifont=Consolas:h11:cANSI
else
set guifont=Monospace\ 12
endif
diff --git a/src/vi/_vimrc b/src/vi/_vimrc
index 1e5666b..bc394a5 100644
--- a/src/vi/_vimrc
+++ b/src/vi/_vimrc
@@ -175,9 +175,9 @@ map <silent> ,cu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>/
if has("win32")
" insert current TS
- map <F5> a<C-R>=strftime('%Y%m%d%H%M%S')<CR><Esc>
- map <S-F5> a<C-R>=strftime('%d.%m.%Y %H:%M:%S%z')<CR><Esc>
- map <C-F5> a<C-R>=strftime('%Ec')<CR><Esc>
+ inoremap <F5> a<C-R>=strftime('%Y%m%d%H%M%S')<CR><Esc>
+ inoremap <S-F5> a<C-R>=strftime('%d.%m.%Y %H:%M:%S%z')<CR><Esc>
+ inoremap <C-F5> a<C-R>=strftime('%Ec')<CR><Esc>
" Printer -----------------------------
set printfont=Courier:h10
@@ -203,8 +203,7 @@ endif
" filetype specific -----------------------------------------------------------
autocmd FileType html setlocal shiftwidth=2 tabstop=2
-
-autocmd FileType javascript setlocal textwidth=100
+autocmd FileType xml setlocal shiftwidth=2 tabstop=2
" typescript
autocmd BufNewFile,BufRead *.ts setlocal ft=javascript