diff options
author | Max Christian Pohle | 2020-03-09 00:28:21 +0100 |
---|---|---|
committer | Max Christian Pohle | 2020-03-09 00:28:21 +0100 |
commit | dbcaab09f2b1f2b6256364407fa67ee67f3cdc66 (patch) | |
tree | 60c2730a33736f94600d262de38f8a90348b9dee | |
parent | 1806b1b40739894ee18bef2c071487274cbab3b7 (diff) | |
download | vim-karlmarks-dbcaab09f2b1f2b6256364407fa67ee67f3cdc66.tar.bz2 vim-karlmarks-dbcaab09f2b1f2b6256364407fa67ee67f3cdc66.zip |
updated submodules, clang-format now uses py3
-rw-r--r-- | ftplugin/c.vim | 2 | ||||
m--------- | pack/_all/opt/jedi-vim | 0 | ||||
m--------- | pack/_all/opt/nerdtree | 0 | ||||
m--------- | pack/_all/opt/tagbar | 0 | ||||
m--------- | pack/_all/opt/ultisnips | 0 | ||||
m--------- | pack/_all/opt/vim-signify | 0 | ||||
m--------- | pack/_all/opt/vim-snippets | 0 | ||||
m--------- | pack/_all/start/papercolor-theme | 0 | ||||
m--------- | pack/_all/start/vim-fugitive | 0 | ||||
m--------- | pack/_all/start/vim-surround | 0 | ||||
m--------- | pack/neovim/opt/LanguageClient-neovim | 0 | ||||
m--------- | pack/neovim/opt/ale | 0 | ||||
m--------- | pack/neovim/opt/deoplete.nvim | 0 | ||||
m--------- | pack/neovim/opt/echodoc.vim | 0 | ||||
m--------- | pack/vim/opt/syntastic | 0 | ||||
m--------- | pack/vim/opt/vimtex | 0 | ||||
-rw-r--r-- | plugin/printing-hardcopy.vim | 10 | ||||
-rw-r--r-- | utils/default-font.conf.old | 49 |
18 files changed, 60 insertions, 1 deletions
diff --git a/ftplugin/c.vim b/ftplugin/c.vim index 96251d9..2831c79 100644 --- a/ftplugin/c.vim +++ b/ftplugin/c.vim | |||
@@ -2,7 +2,7 @@ setlocal equalprg=clang-format | |||
2 | setlocal breakat-=- | 2 | setlocal breakat-=- |
3 | setlocal keywordprg=man\ 3 | 3 | setlocal keywordprg=man\ 3 |
4 | 4 | ||
5 | map <buffer> = :pyf /usr/share/clang/clang-format.py<CR> | 5 | map <buffer> = :pyf3 /usr/share/clang/clang-format.py<CR> |
6 | 6 | ||
7 | 7 | ||
8 | let c_space_errors=1 | 8 | let c_space_errors=1 |
diff --git a/pack/_all/opt/jedi-vim b/pack/_all/opt/jedi-vim | |||
Subproject b4b2f3ef54c02d6f8fb09cf1eb0f139d3a45bdb | Subproject e83112f9aab147ab485ee7af72e01d047c5206d | ||
diff --git a/pack/_all/opt/nerdtree b/pack/_all/opt/nerdtree | |||
Subproject 2d639b70e73ecf3f62884a578fe5e5937e6d8a9 | Subproject e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee | ||
diff --git a/pack/_all/opt/tagbar b/pack/_all/opt/tagbar | |||
Subproject 387bbadda98e1376ff3871aa461b1f0abd4ece7 | Subproject 679a9d9ac9579bd18225409d85ed4870fb6c9c6 | ||
diff --git a/pack/_all/opt/ultisnips b/pack/_all/opt/ultisnips | |||
Subproject 1a99766b73783bafb08cfa07d7e29e5387c5518 | Subproject e910b4fb9e276d18ed140fc492f30967ef9ace5 | ||
diff --git a/pack/_all/opt/vim-signify b/pack/_all/opt/vim-signify | |||
Subproject 80f64eace5694413f9dfd8e70e4a7018b56c42b | Subproject 56db16f8d3825c4d066c2faf05315c2b208cd5f | ||
diff --git a/pack/_all/opt/vim-snippets b/pack/_all/opt/vim-snippets | |||
Subproject 9e323311e5fff93482aeaebd4ae3a1c6339ca6f | Subproject 28ad6344e1ce59d11c095405e1e76c0183142de | ||
diff --git a/pack/_all/start/papercolor-theme b/pack/_all/start/papercolor-theme | |||
Subproject 20f3b25cdd772d4483eb8ced453f94f93b6126e | Subproject ddd09867ed4e020b3ba2eb47dc3ef365da5b0fe | ||
diff --git a/pack/_all/start/vim-fugitive b/pack/_all/start/vim-fugitive | |||
Subproject 698065596c9ccee74825ac9667357ce8222ed7b | Subproject e06005a742714a4293f1928bca0aca7c9e38338 | ||
diff --git a/pack/_all/start/vim-surround b/pack/_all/start/vim-surround | |||
Subproject fab8621670f71637e9960003af28365129b1dfd | Subproject f51a26d3710629d031806305b6c8727189cd193 | ||
diff --git a/pack/neovim/opt/LanguageClient-neovim b/pack/neovim/opt/LanguageClient-neovim | |||
Subproject ee6cdb0940d9c2c95f31488f7d463b2d12abcbc | Subproject 222e2503666e463a5c55edc52f140fde2bb76a9 | ||
diff --git a/pack/neovim/opt/ale b/pack/neovim/opt/ale | |||
Subproject f9322113095ac01c00d4c38da6aca715663e35c | Subproject 8f7ccdc5e95302223c516a0113f5af7e075dc04 | ||
diff --git a/pack/neovim/opt/deoplete.nvim b/pack/neovim/opt/deoplete.nvim | |||
Subproject 70a11ee67f3c4353e48aad69812c34b5c8489f0 | Subproject e5a7e3bc029505176c58fd7d8bf4efeeb8fb458 | ||
diff --git a/pack/neovim/opt/echodoc.vim b/pack/neovim/opt/echodoc.vim | |||
Subproject c12d2e683fb749f9c0d4a099d894baa3d9d5f33 | Subproject cd9beff92b52990d991a0b6a0f4d20aa600e570 | ||
diff --git a/pack/vim/opt/syntastic b/pack/vim/opt/syntastic | |||
Subproject 3b3f4ee8abf81191d1eca4350448148b86e8a74 | Subproject f3766538720116f099a8b1517f76ae2f094afd2 | ||
diff --git a/pack/vim/opt/vimtex b/pack/vim/opt/vimtex | |||
Subproject 661c25d14a8a9a41033d78387624acbedf1d5c5 | Subproject 3ccc17480c7b887ed9dcc0c223e250bdd784fd0 | ||
diff --git a/plugin/printing-hardcopy.vim b/plugin/printing-hardcopy.vim new file mode 100644 index 0000000..ad51b02 --- /dev/null +++ b/plugin/printing-hardcopy.vim | |||
@@ -0,0 +1,10 @@ | |||
1 | let default_expr=&printexpr | ||
2 | |||
3 | " if filereadable("/usr/bin/a2ps") | ||
4 | " let &printexpr = "system('a2ps -1gEmail --borders=no --strip=3')" | ||
5 | " endif | ||
6 | " | ||
7 | set printoptions=portrait:y,number:n,syntax:n,left:25mm,right:20mm,top:27mm,bottom:25mm | ||
8 | |||
9 | let &printfont = "monospace 11" | ||
10 | let &printexpr = "system('lpr -p' . (&printdevice == '' ? '' : ' -P' . &printdevice) . ' ' . v:fname_in) . delete(v:fname_in) + v:shell_error" | ||
diff --git a/utils/default-font.conf.old b/utils/default-font.conf.old new file mode 100644 index 0000000..ec2e12e --- /dev/null +++ b/utils/default-font.conf.old | |||
@@ -0,0 +1,49 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/conf.d/ --> | ||
3 | <!DOCTYPE fontconfig SYSTEM "/etc/fonts/fonts.dtd"> | ||
4 | <fontconfig> | ||
5 | <match target="pattern"> | ||
6 | <test qual="any" name="family"><string>serif</string></test> | ||
7 | <edit name="family" mode="assign" binding="same"><string>Noto Serif</string></edit> | ||
8 | </match> | ||
9 | <match target="pattern"> | ||
10 | <test qual="any" name="family"><string>sans-serif</string></test> | ||
11 | <edit name="family" mode="assign" binding="same"><string>Noto Sans</string></edit> | ||
12 | </match> | ||
13 | <match target="pattern"> | ||
14 | <test qual="any" name="family"><string>monospace</string></test> | ||
15 | <edit mode="assign" name="family"><string>Hack</string></edit> | ||
16 | <edit mode="prepend" name="family"><string>Noto Color Emoji</string></edit> | ||
17 | <edit mode="prepend" name="family"><string>emoji</string></edit> | ||
18 | |||
19 | <test name="slant" compare="not_eq"><const>italic</const></test> | ||
20 | <edit mode="assign" name="style"><string>bold</string></edit> | ||
21 | </match> | ||
22 | </fontconfig> | ||
23 | <!-- | ||
24 | family: "Anonymous Pro for Powerline"(s) | ||
25 | family: "Consolas for Powerline"(s) "Consolas for Powerline FixedD"(s) | ||
26 | family: "DejaVu Sans Mono for Powerline"(s) | ||
27 | family: "Droid Sans Mono for Powerline"(s) | ||
28 | family: "Inconsolata for Powerline"(s) | ||
29 | family: "Inconsolata-dz for Powerline"(s) | ||
30 | family: "Liberation Mono for Powerline"(s) | ||
31 | family: "Menlo for Powerline"(s) | ||
32 | family: "Meslo LG L DZ for Powerline"(s) | ||
33 | family: "Meslo LG L for Powerline"(s) | ||
34 | family: "Meslo LG M DZ for Powerline"(s) | ||
35 | family: "Meslo LG M for Powerline"(s) | ||
36 | family: "Meslo LG S DZ for Powerline"(s) | ||
37 | family: "Meslo LG S for Powerline"(s) | ||
38 | family: "PowerlineSymbols"(s) | ||
39 | family: "Source Code Pro for Powerline"(s) | ||
40 | family: "Source Code Pro for Powerline"(s) "Source Code Pro Black"(s) | ||
41 | family: "Source Code Pro for Powerline"(s) "Source Code Pro ExtraLight"(s) | ||
42 | family: "Source Code Pro for Powerline"(s) "Source Code Pro Light"(s) | ||
43 | family: "Source Code Pro for Powerline"(s) "Source Code Pro Medium"(s) | ||
44 | family: "Source Code Pro for Powerline"(s) "Source Code Pro Semibold"(s) | ||
45 | family: "Terminus for Powerline"(s) | ||
46 | family: "Ubuntu Mono derivative Powerline"(s) | ||
47 | family: "xos4 Terminess Powerline"(s) | ||
48 | family: "xos4 Terminus for Powerline"(s) | ||
49 | --> | ||