Merge branch 'master' into master

websfx · Nov 6, 2020 · 026f943 · 026f943
2 parents b227556 + e08ee8c
commit 026f943
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/.vimrc b/.vimrc
@@ -312,7 +312,7 @@ map <leader>w <Plug>(easymotion-bd-w)
 nmap <leader>w <Plug>(easymotion-overwin-w)
 
 " nerdtree-git-plugin
-let g:NERDTreeIndicatorMapCustom = {
+let g:NERDTreeGitStatusIndicatorMapCustom = {
             \ "Modified"  : "✹",
             \ "Staged"    : "✚",
             \ "Untracked" : "✭",
@@ -326,7 +326,7 @@ let g:NERDTreeIndicatorMapCustom = {
             \ }
 
 " LeaderF
-nnoremap <leader>f :LeaderfFile ~<cr>
+nnoremap <leader>f :LeaderfFile .<cr>
 let g:Lf_WildIgnore = {
             \ 'dir': ['.svn','.git','.hg','.vscode','.wine','.deepinwine','.oh-my-zsh'],
             \ 'file': ['*.sw?','~$*','*.bak','*.exe','*.o','*.so','*.py[co]']

diff --git a/README.md b/README.md
@@ -60,6 +60,7 @@ An automatic configuration program for vim
 <td><a href="https://distrowatch.com/table.php?distribution=manjaro"><img src="https://distrowatch.com/images/yvzhuwbpy/manjaro.png"/></a><p align="center"></p></td>
 <td><a href="https://distrowatch.com/table.php?distribution=opensuse"><img src="https://distrowatch.com/images/yvzhuwbpy/opensuse.png"/></a><p align="center"></p></td>
 <td><a href="https://distrowatch.com/table.php?distribution=gentoo"><img src="https://distrowatch.com/images/yvzhuwbpy/gentoo.png"/></a><p align="center"></p></td>
+<td><a href="https://distrowatch.com/table.php?distribution=raspios"><img src="https://distrowatch.com/images/yvzhuwbpy/raspios.png"/></a><p align="center"></p></td>
 </tr>
 </table>
 
@@ -318,6 +319,9 @@ An automatic configuration program for vim
 <a href="https://github.com/ardinzh" target="_blank" title="ardinzh">
 <img src="https://github.com/ardinzh.png?size=64" width="64" height="64" alt="ardinzh">
 </a>
+<a href="https://github.com/BD7IWD" target="_blank" title="BD7IWD">
+<img src="https://github.com/BD7IWD.png?size=64" width="64" height="64" alt="BD7IWD">
+</a>
 
 
 ## 支持开源:heart:
@@ -334,11 +338,15 @@ An automatic configuration program for vim
 | 2     | [zhoumengkang][80] | ¥50   | 2019-09-29 |
 | 3     | [zibraque][85]     | ¥50   | 2019-11-25 |
 | 4     | [gfreewind][86]    | ¥20   | 2019-12-27 |
+| 5     | [wh656325437][88]  | ¥20   | 2020-07-02 |
+| 6     | [luguifang][89]    | ¥20   | 2020-07-12 |
+| 7     | [liyewen521][90]   | ¥20   | 2020-07-27 |
+| 8     | [xht19980305][91]  | ¥20   | 2020-08-14 |
 
 
 ## vimplus:star:趋势图
 
-[![Sparkline](https://stars.medv.io/chxuan/vimplus.svg)](https://stars.medv.io/chxuan/vimplus)
+![Stargazers over time](https://starchart.cc/chxuan/vimplus.svg)
 
 
 ## License
@@ -402,4 +410,8 @@ This software is licensed under the [MIT license][75]. © 2016 chxuan
   [85]: https://github.com/zibraque
   [86]: https://github.com/gfreewind
   [87]: https://termux.com/
+  [88]: https://github.com/wh656325437
+  [89]: https://github.com/luguifang
+  [90]: https://github.com/liyewen521
+  [91]: https://github.com/xht19980305
 
diff --git a/install.sh b/install.sh
@@ -176,7 +176,7 @@ function compile_vim_on_ubuntu()
         --enable-multibyte \
         --enable-rubyinterp \
         --enable-pythoninterp \
-        --with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \
+        --with-python-config-dir=/usr/lib/python2.7/config-`dpkg-architecture -qDEB_HOST_MULTIARCH` \
         --enable-perlinterp \
         --enable-luainterp \
         --enable-gui=gtk2 \
@@ -199,7 +199,7 @@ function compile_vim_on_debian()
         --enable-multibyte \
         --enable-rubyinterp \
         --enable-pythoninterp \
-        --with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \
+        --with-python-config-dir=/usr/lib/python2.7/config-`dpkg-architecture -qDEB_HOST_MULTIARCH` \
         --enable-perlinterp \
         --enable-luainterp \
         --enable-gui=gtk2 \
@@ -433,10 +433,24 @@ function install_ycm()
     read -p "Please choose to compile ycm with python2 or python3, if there is a problem with the current selection, please choose another one. [2/3] " version
     if [[ $version == "2" ]]; then
         echo "Compile ycm with python2."
-        python2.7 ./install.py --clang-completer
+        {
+            python2.7 ./install.py --clang-completer
+        } || {
+            echo "##########################################"
+            echo "Build error, trying rebuild without Clang."
+            echo "##########################################"
+            python2.7 ./install.py
+        }
     else
         echo "Compile ycm with python3."
-        python3 ./install.py --clang-completer
+        {
+            python3 ./install.py --clang-completer
+        } || {
+            echo "##########################################"
+            echo "Build error, trying rebuild without Clang."
+            echo "##########################################"
+            python3 ./install.py
+        }
     fi
 }