aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--after/syntax/c.vim4
-rw-r--r--ftplugin/doxygen.vim2
-rw-r--r--ftplugin/text.vim6
-rwxr-xr-xinstall.sh3
4 files changed, 14 insertions, 1 deletions
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 301cd90..0bacea0 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -25,6 +25,10 @@ syn region cBlock start=/{/ end=/}/ transparent
25" configure c.vim so that it automatically allows doxygen like comments 25" configure c.vim so that it automatically allows doxygen like comments
26let g:load_doxygen_syntax=1 26let g:load_doxygen_syntax=1
27 27
28
29set formatoptions+=j " Where it makes sense, remove a comment leader when joining lines.
30set formatoptions+=1 " Don't break a line after a one-letter word.
31
28" multiple single line comments in a row " broken! 32" multiple single line comments in a row " broken!
29" syn region myCComment start="/\*" end="\*/" fold keepend transparent 33" syn region myCComment start="/\*" end="\*/" fold keepend transparent
30 34
diff --git a/ftplugin/doxygen.vim b/ftplugin/doxygen.vim
index dd2cdf2..7dcd7e5 100644
--- a/ftplugin/doxygen.vim
+++ b/ftplugin/doxygen.vim
@@ -1 +1,3 @@
1let g:load_doxygen_syntax=1 1let g:load_doxygen_syntax=1
2
3syntax match Normal /@copydoc/ conceal cchar=↺
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
index 226de51..2095ef5 100644
--- a/ftplugin/text.vim
+++ b/ftplugin/text.vim
@@ -1,2 +1,8 @@
1" highlight double words (its unlikely they are right) 1" highlight double words (its unlikely they are right)
2autocmd InsertLeave * syntax match Convention /\v<(\w+)\_s+\1>/ containedin=ALL 2autocmd InsertLeave * syntax match Convention /\v<(\w+)\_s+\1>/ containedin=ALL
3
4
5set autoindent nosmartindent nocindent
6
7set formatoptions+=n " When formatting text, recognize numbered lists.
8set formatoptions+=a " Automatic formatting of paragraphs.
diff --git a/install.sh b/install.sh
index 2eb2a56..bc8a868 100755
--- a/install.sh
+++ b/install.sh
@@ -10,9 +10,10 @@ cd $THIS_DIR
10 10
11# Fetch dependencies (git submodules)... 11# Fetch dependencies (git submodules)...
12awk '/path = (.*)/{PATH=$3;next} /url = /{URL=$3;next} URL{system("git submodule add " URL " " PATH)}' .gitmodules 12awk '/path = (.*)/{PATH=$3;next} /url = /{URL=$3;next} URL{system("git submodule add " URL " " PATH)}' .gitmodules
13git submodule update --init --remote --progress 13git submodule update --init --remote --progress --recursive
14 14
15# compile YouCompleteMe 15# compile YouCompleteMe
16# dependencies: python-certifi
16cd $THIS_DIR/pack/vim/opt/YouCompleteMe 17cd $THIS_DIR/pack/vim/opt/YouCompleteMe
17./install.py --clang-completer 18./install.py --clang-completer
18 19
..