Merging

2019-03-17 12:43:16 -05:00
parent 4cd0866979 416cffd7d3
commit 38ad193ba7
29 changed files with 2538 additions and 102 deletions
--- a/vim/.vim/autoload/plug.vim
+++ b/vim/.vim/autoload/plug.vim
--- a/vim/.vim/bundle/SimpylFold
+++ b/vim/.vim/bundle/SimpylFold
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
--- a/vim/.vim/bundle/ctrlp.vim
+++ b/vim/.vim/bundle/ctrlp.vim
--- a/vim/.vim/bundle/dirindex.html
+++ b/vim/.vim/bundle/dirindex.html
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <link rel=stylesheet type="text/css" href="../../../../style.css">
-   <title>Directory Index: dots/vim/.vim/bundle</title>
-</head>
-<body>
-
-<table class="toptable dirtop"><tr><td>
-<p class="toptitle"><a href="../../../../dirindex.html">(root)</a>
- / 
-<a href="../../../dirindex.html">dots</a>
- / 
-<a href="../../dirindex.html">vim</a>
- / 
-<a href="../dirindex.html">.vim</a>
- / 
-<a href="dirindex.html">bundle</a></p>
-<p class="topsubtitle">Directory Index</p>
-</td></tr></table>
-
-<div class="mininav">
-<a href="../../../../dirindex.html">Root</a> |
-<a href="../../../../allindex.html">Global</a> |
-<a href="../../../../sortindex.html">Sorted</a>
-</div>
-
-<h3>Sub-directories:</h3>
-<ul>
-<li><a href="jedi-vim/dirindex.html">jedi-vim</a></li>
-<li><a href="nerdtree/dirindex.html">nerdtree</a></li>
-<li><a href="syntastic/dirindex.html">syntastic</a></li>
-</ul><p>
-
-
-
-
-
-</body>
-</html>
--- a/vim/.vim/bundle/goyo.vim
+++ b/vim/.vim/bundle/goyo.vim
--- a/vim/.vim/bundle/indentpython.vim
+++ b/vim/.vim/bundle/indentpython.vim
--- a/vim/.vim/bundle/index.html
+++ b/vim/.vim/bundle/index.html
@@ -1 +0,0 @@
-dirindex.html
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
--- a/vim/.vim/bundle/minibufexpl.vim
+++ b/vim/.vim/bundle/minibufexpl.vim
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
--- a/vim/.vim/bundle/python-mode
+++ b/vim/.vim/bundle/python-mode
--- a/vim/.vim/bundle/supertab
+++ b/vim/.vim/bundle/supertab
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
--- a/vim/.vim/bundle/targets.vim
+++ b/vim/.vim/bundle/targets.vim
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
--- a/vim/.vim/bundle/vim-airline-themes
+++ b/vim/.vim/bundle/vim-airline-themes
--- a/vim/.vim/bundle/vim-buftabline
+++ b/vim/.vim/bundle/vim-buftabline
--- a/vim/.vim/bundle/vim-easyescape
+++ b/vim/.vim/bundle/vim-easyescape
--- a/vim/.vim/bundle/vim-flake8
+++ b/vim/.vim/bundle/vim-flake8
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
--- a/vim/.vim/bundle/vim-surround
+++ b/vim/.vim/bundle/vim-surround
--- a/vim/.vim/dirindex.html
+++ b/vim/.vim/dirindex.html
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <link rel=stylesheet type="text/css" href="../../../style.css">
-   <title>Directory Index: dots/vim/.vim</title>
-</head>
-<body>
-
-<table class="toptable dirtop"><tr><td>
-<p class="toptitle"><a href="../../../dirindex.html">(root)</a>
- / 
-<a href="../../dirindex.html">dots</a>
- / 
-<a href="../dirindex.html">vim</a>
- / 
-<a href="dirindex.html">.vim</a></p>
-<p class="topsubtitle">Directory Index</p>
-</td></tr></table>
-
-<div class="mininav">
-<a href="../../../dirindex.html">Root</a> |
-<a href="../../../allindex.html">Global</a> |
-<a href="../../../sortindex.html">Sorted</a>
-</div>
-
-<h3>Sub-directories:</h3>
-<ul>
-<li><a href="bundle/dirindex.html">bundle</a></li>
-</ul><p>
-
-
-
-
-
-</body>
-</html>
--- a/vim/.vim/index.html
+++ b/vim/.vim/index.html
@@ -1 +0,0 @@
-dirindex.html