X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/blobdiff_plain/75726cbdbdc0582b1cb231999204e899faef8c72..8528ed9de092fa9d4c635f385bb45e9664226bcc:/vimrc?ds=sidebyside

diff --git a/vimrc b/vimrc
index adcc2f5..d472f91 100644
--- a/vimrc
+++ b/vimrc
@@ -46,8 +46,7 @@ call vundle#begin()
 Plugin 'gmarik/vundle'
 
 " Helper scripts for editing ReStructuredText
-" Plugin 'edthedev/vim-rst'
-Plugin 'edthedev/text-helper.vim'
+" Plugin 'edthedev/text-helper.vim'
 
 " EdTheDev's Minion file organizer.
 Plugin 'edthedev/minion'
@@ -130,7 +129,7 @@ let g:PyLintOnWrite = 1
 " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1101,E1120,R0201,R0901,R0903,R0904,R0913'
 " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1101,E1120,R0201,R0901,R0903,R0904,R0913,E1002,E1103'
 " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1002,E1101,E1103,E1120,R0201,R0901,R0903,R0904,R0913'
-let g:PyLintDissabledMessages = 'C0103,C0111,C0301,C0322,C0323,C0324,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0621,W0631,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
+let g:PyLintDissabledMessages = 'C0103,C0111,C0301,C0322,C0323,C0324,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0621,W0631,E0611,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
 
 Plugin 'edthedev/arduino.vim'
 " Plugin 'edthedev/vim-arduino-ino'
@@ -146,6 +145,8 @@ Plugin 'itchyny/thumbnail.vim'
 " :Thumbnail
 "
 " Plugin 'farseer90718/vim-taskwarrior'
+" let g:task_rc_override = 'defaultwidth=999'
+" Plugin 'farseer90718/vim-taskwarrior'
 " let g:task_rc_override = 'defaultwidth=0'
 " let g:task_report_name     = 'list'
 " Read up on it here:  https://github.com/farseer90718/vim-taskwarrior
@@ -170,27 +171,32 @@ Plugin 'Shougo/unite.vim'
 " Better status line.
 Plugin 'bling/vim-airline'
 
-Plugin 'vimwiki/vimwiki'
-let g:vimwiki_list = [{'path': '~/Box Sync/wiki', 'path_html': '~/cites_wiki_html/'},{'path': '~/Dropbox/wiki', 'path_html': '~/vim_wiki_html/'}]
+" Plugin 'vimwiki/vimwiki'
+" let g:vimwiki_list = [{'path': '~/Box Sync/wiki', 'path_html': '~/cites_wiki_html/'},{'path': '~/Dropbox/wiki', 'path_html': '~/vim_wiki_html/'}]
 
 " Emacs style kill-paste ring
-Plugin 'vim-scripts/YankRing.vim'
+" Plugin 'vim-scripts/YankRing.vim'
 "    :h yankring.txt
 "    :h yankring-tutorial
 
 " Javascript
-Plugin 'maksimr/vim-jsbeautify'
+" Plugin 'maksimr/vim-jsbeautify'
 "Plugin 'einars/js-beautify'
-Plugin 'Delapouite/vim-javascript-syntax'
+" 
+" Plugin 'Delapouite/vim-javascript-syntax'
 "Plugin 'pangloss/vim-javascript'
 
 " HTML
-Bundle 'othree/html5.vim'
+" Bundle 'othree/html5.vim'
 "Bundle 'evidens/vim-twig'
 "Bundle 'tokutake/twig-indent'
 "Bundle 'groenewege/vim-less'
 "Bundle 'hail2u/vim-css3-syntax'
 
+" AsciiDoc
+" Very broken:
+" Bundle 'dahu/vim-asciidoc'
+
 call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle
 
@@ -199,8 +205,13 @@ nn <space> <c-d>
 " Shift space is undetectable in many terminals...
 nn <S-space> <c-u>
 
+
+" If not something else, then asciidoc
+" set filetype=asciidoc
+
 " Don't show tabs for HTML files. Do show trailing spaces."
 au FileType html set nolist
+au FileType javascript set nolist
 
 " Two spaces as tabs in .feature files.
 au BufRead,BufNewFile *.feature set filetype=yaml
@@ -220,3 +231,4 @@ set softtabstop=4 " makes the spaces feel like real tabs
 " Sensible default for everything else.
 set tabstop=2
 set shiftwidth=2
+