diff options
Diffstat (limited to '')
| -rw-r--r-- | ftplugin/clojure.vim | 5 | ||||
| -rw-r--r-- | ftplugin/csv.vim | 10 | ||||
| -rw-r--r-- | ftplugin/go.vim | 17 | ||||
| -rw-r--r-- | ftplugin/markdown.vim | 1 | ||||
| -rw-r--r-- | ftplugin/perl.vim | 1 | ||||
| -rw-r--r-- | ftplugin/scala.vim | 4 |
6 files changed, 33 insertions, 5 deletions
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim index bbcbd319..b46b9c80 100644 --- a/ftplugin/clojure.vim +++ b/ftplugin/clojure.vim @@ -23,9 +23,8 @@ setlocal iskeyword+=?,-,*,!,+,/,=,<,>,.,:,$ " of user-defined def* definitions. setlocal define=\\v[(/]def(ault)@!\\S* -" Remove 't' from 'formatoptions' to avoid auto-wrapping code. The '+=croql' -" is standard ftplugin boilerplate, although it is arguably intrusive. -setlocal formatoptions-=t formatoptions+=croql +" Remove 't' from 'formatoptions' to avoid auto-wrapping code. +setlocal formatoptions-=t " Lisp comments are routinely nested (e.g. ;;; SECTION HEADING) setlocal comments=n:; diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim index 596012a3..20532744 100644 --- a/ftplugin/csv.vim +++ b/ftplugin/csv.vim @@ -1606,6 +1606,9 @@ fu! <sid>AnalyzeColumn(...) "{{{3 let qty = len(data) let res = {} for item in data + if empty(item) + let item = 'NULL' + endif if !get(res, item) let res[item] = 0 endif @@ -1613,6 +1616,7 @@ fu! <sid>AnalyzeColumn(...) "{{{3 endfor let max_items = reverse(sort(values(res))) + let count_items = keys(res) if len(max_items) > 5 call remove(max_items, 5, -1) call filter(res, 'v:val =~ ''^''.join(max_items, ''\|'').''$''') @@ -1623,9 +1627,9 @@ fu! <sid>AnalyzeColumn(...) "{{{3 else let title="Nr\tCount\tValue" endif - echohl "Title" + echohl Title echo printf("%s", title) - echohl "Normal" + echohl Normal echo printf("%s", repeat('=', strdisplaywidth(title))) let i=1 @@ -1650,6 +1654,8 @@ fu! <sid>AnalyzeColumn(...) "{{{3 endif endfor endfor + echo printf("%s", repeat('=', strdisplaywidth(title))) + echo printf("different values: %d", len(count_items)) unlet max_items endfunc diff --git a/ftplugin/go.vim b/ftplugin/go.vim new file mode 100644 index 00000000..8066733c --- /dev/null +++ b/ftplugin/go.vim @@ -0,0 +1,17 @@ +" Copyright 2013 The Go Authors. All rights reserved. +" Use of this source code is governed by a BSD-style +" license that can be found in the LICENSE file. +" +" go.vim: Vim filetype plugin for Go. + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +setlocal comments=s1:/*,mb:*,ex:*/,:// +setlocal commentstring=//\ %s + +let b:undo_ftplugin = "setl com< cms<" + +" vim:ts=4:sw=4:et diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim index 022da06e..5d6ebecd 100644 --- a/ftplugin/markdown.vim +++ b/ftplugin/markdown.vim @@ -1,6 +1,7 @@ " Vim filetype plugin " Language: Markdown " Maintainer: Tim Pope <vimNOSPAM@tpope.org> +" Last Change: 2013 May 30 if exists("b:did_ftplugin") finish diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim index 9e210428..d52015e3 100644 --- a/ftplugin/perl.vim +++ b/ftplugin/perl.vim @@ -82,6 +82,7 @@ let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< kp< path<" . " proper matching for matchit plugin let b:match_skip = 's:comment\|string\|perlQQ\|perlShellCommand\|perlHereDoc\|perlSubstitution\|perlTranslation\|perlMatch\|perlFormatField' +let b:match_words = '\<if\>:\<elsif\>:\<else\>' " Restore the saved compatibility options. let &cpo = s:save_cpo diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim index 6db56d04..00d45669 100644 --- a/ftplugin/scala.vim +++ b/ftplugin/scala.vim @@ -4,6 +4,10 @@ setlocal softtabstop=2 setlocal expandtab setlocal formatoptions=tcqr setlocal commentstring=//%s +let &l:include = '^\s*import' +let &l:includeexpr = 'substitute(v:fname,"\\.","/","g")' +setlocal path+=src/main/scala,src/test/scala +setlocal suffixesadd=.scala set makeprg=sbt\ -Dsbt.log.noformat=true\ compile set efm=%E\ %#[error]\ %f:%l:\ %m,%C\ %#[error]\ %p^,%-C%.%#,%Z, |