From 6ba3ace3301e27ca8ee1dc1eea1b0b775e28fc57 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Thu, 30 Jan 2020 00:14:57 -0500 Subject: [PATCH] Remove gundo (which no longer works) --- .gitmodules | 3 - README.md | 6 +- vim/bundle/gundo.vim | 1 - vim/config/keyboard.vim | 108 +++++++++++-------------------- vim/config/plugins/gundo.vim | 5 -- vim/config/plugins/lightline.vim | 5 +- vimrc | 1 - 7 files changed, 40 insertions(+), 89 deletions(-) delete mode 160000 vim/bundle/gundo.vim delete mode 100644 vim/config/plugins/gundo.vim diff --git a/.gitmodules b/.gitmodules index 08a7a06..c727970 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,9 +22,6 @@ [submodule "vim/bundle/vim-togglelist"] path = vim/bundle/vim-togglelist url = https://github.com/milkypostman/vim-togglelist.git -[submodule "vim/bundle/gundo.vim"] - path = vim/bundle/gundo.vim - url = https://github.com/sjl/gundo.vim.git [submodule "vim/bundle/unite.vim"] path = vim/bundle/unite.vim url = https://github.com/Shougo/unite.vim.git diff --git a/README.md b/README.md index 175b828..47a8521 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ A theme, config and collection of plugins for Vim. * **Bash**: Required by the _update_ and _gentags_ scripts. * **Coreutils**: Required by the _update_ script. * **Git**: Required by the _update_ script and git-related plugins. -* **Python**: Required by the _gundo.vim_ and _MatchTagAlways_ plugins. +* **Python**: Required by the _deoplete_ and _MatchTagAlways_ plugins. ## Optional Requirements ## * **Compilers, Linters and Runtimes**: The ale plugin can use compilers, linters and runtimes to provide real-time syntax checking. * **CTags**: Required by the _tagbar_ and _deoplete_ plugins as well as the _gentags_ script ([ctags website](http://ctags.sourceforge.net)). * **Powerline Fonts**: Required to enable the fancier looking status line ([powerline-fonts repo](https://github.com/Lokaltog/powerline-fonts)). -* **Python 3 and Neovim Python Module**: Required for _deoplete_ autocompletion +* **Neovim Python Module**: Required for _deoplete_ autocompletion ## Distribution Features ## @@ -102,7 +102,6 @@ As usual, to have your system use `vimpager` in place of `less`, you'll need to |----------------------|------|-----------------------------------------------| | F9 and Backslash+} | ALL | Toggle the **extradite** git history window | | F10 and Backslash+{ | ALL | Toggle the **tagbar** source code tag sidebar | -| F11 and Backslash+\] | ALL | Toggle the **gundo** undo history sidebar | | F12 and Backslash+\[ | ALL | Toggle **vimfiler** file manager sidebar | | Backslash+Backslash | N | Toggle the location list for **ale** issues | @@ -170,7 +169,6 @@ For a complete list of mappings specific to **darkcloud-vimconfig**, check the l * [webapi-vim](https://github.com/mattn/webapi-vim): A web library used by emmet to provide support for custom snippets. * [FastFold](https://github.com/Konfekt/FastFold): Speed up Vim by updating folds only when called-for. * [goyo.vim](https://github.com/junegunn/goyo.vim): Distraction-free writing in Vim. -* [gundo.vim](https://github.com/sjl/gundo.vim): Sidebar to visualize your undo tree and browse the differences of each change. * [incsearch.vim](https://github.com/haya14busa/incsearch.vim): Improved incremental searching for Vim. * [lightline.vim](https://github.com/itchyny/lightline.vim): A light and configurable statusline/tabline for Vim. * [MatchTagAlways](https://github.com/Valloric/MatchTagAlways): A Vim plugin that always highlights the enclosing html/xml tags. diff --git a/vim/bundle/gundo.vim b/vim/bundle/gundo.vim deleted file mode 160000 index 99e6240..0000000 --- a/vim/bundle/gundo.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99e6240340d9ba07b66c544daf44fa7caffbf7e7 diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 6a38b60..27eb85d 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -101,10 +101,6 @@ " | (A) -> toggle the tagbar sidebar " | (A) -> toggle the tagbar sidebar " { | (N) -> toggle the tagbar sidebar -" | (A) -> toggle the gundo sidebar -" | (A) -> toggle the gundo sidebar -" | (A) -> toggle the gundo sidebar -" ] | (N) -> toggle the gundo sidebar " | (A) -> toggle vimfiler sidebar " | (A) -> toggle vimfiler sidebar " | (A) -> toggle vimfiler sidebar @@ -254,15 +250,6 @@ " | (A) -> same as Up " h | (A) -> same as k " -" (gundo) -" | (A) -> same as normal + justify on the left -" | (A) -> same as the left mouse -" | (A) -> same as the left mouse -" | (A) -> same as down -" l | (A) -> same as j -" | (A) -> same as Up -" h | (A) -> same as k -" " (help) " q | (A) -> close the dialog " ? | (A) -> close the dialog @@ -542,18 +529,6 @@ inoremap ':TagbarToggle' nnoremap { ':TagbarToggle:echo "tagbar toggled"' - "bindings to trigger the gundo undo history - nnoremap ':GundoToggle:echo "undo history sidebar toggled"' - xnoremap ':GundoToggle' - inoremap ':GundoToggle' - nnoremap ':GundoToggle:echo "undo history sidebar toggled"' - xnoremap ':GundoToggle' - inoremap ':GundoToggle' - nnoremap ':GundoToggle:echo "undo history sidebar toggled"' - xnoremap ':GundoToggle' - inoremap ':GundoToggle' - nnoremap ] ':GundoToggle:echo "undo history sidebar toggled"' - "trigger vimfiler nnoremap ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' xnoremap ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' @@ -825,15 +800,6 @@ autocmd FileType extradite map q autocmd FileType extradite map } q - "gundo - autocmd FileType gundo map 0l - autocmd FileType gundo map - autocmd FileType gundo map - autocmd FileType gundo map - autocmd FileType gundo map l j - autocmd FileType gundo map - autocmd FileType gundo map h k - "help if !&diff autocmd FileType help map q ':q' @@ -880,47 +846,47 @@ "MAPPINGS DISABLED FOR GIVEN FILETYPES: {{{ "remove incompatible toggles from specific file types - autocmd Filetype extradite,gundo,help,tagbar,qf,vimfiler noremap ` - autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap - autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap - autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap - autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap } - autocmd Filetype extradite,gundo,help,qf,vimfiler noremap - autocmd Filetype extradite,gundo,help,qf,vimfiler noremap - autocmd Filetype extradite,gundo,help,qf,vimfiler noremap - autocmd Filetype extradite,gundo,help,qf,vimfiler noremap { + autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap ` + autocmd Filetype help,tagbar,qf,vimfiler,diff noremap + autocmd Filetype help,tagbar,qf,vimfiler,diff noremap + autocmd Filetype help,tagbar,qf,vimfiler,diff noremap + autocmd Filetype help,tagbar,qf,vimfiler,diff noremap } + autocmd Filetype extradite,help,qf,vimfiler noremap + autocmd Filetype extradite,help,qf,vimfiler noremap + autocmd Filetype extradite,help,qf,vimfiler noremap + autocmd Filetype extradite,help,qf,vimfiler noremap { autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap ] autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap - autocmd Filetype extradite,gundo,help,tagbar,qf noremap - autocmd Filetype extradite,gundo,help,tagbar,qf noremap - autocmd Filetype extradite,gundo,help,tagbar,qf noremap - autocmd Filetype extradite,gundo,help,tagbar,qf noremap [ + autocmd Filetype extradite,help,tagbar,qf noremap + autocmd Filetype extradite,help,tagbar,qf noremap + autocmd Filetype extradite,help,tagbar,qf noremap + autocmd Filetype extradite,help,tagbar,qf noremap [ "disable modifier keys with directions that would interfere with logic - autocmd Filetype qf,gundo,vimfiler noremap - autocmd Filetype qf,gundo,vimfiler noremap - autocmd Filetype qf,gundo,vimfiler noremap - autocmd Filetype qf,gundo,vimfiler noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler noremap - autocmd Filetype qf,gundo,vimfiler noremap - autocmd Filetype qf,gundo,vimfiler noremap - autocmd Filetype qf,gundo,vimfiler noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap - autocmd Filetype qf,gundo,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler noremap + autocmd Filetype qf,vimfiler noremap + autocmd Filetype qf,vimfiler noremap + autocmd Filetype qf,vimfiler noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler noremap + autocmd Filetype qf,vimfiler noremap + autocmd Filetype qf,vimfiler noremap + autocmd Filetype qf,vimfiler noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap + autocmd Filetype qf,vimfiler,extradite noremap "}}} diff --git a/vim/config/plugins/gundo.vim b/vim/config/plugins/gundo.vim deleted file mode 100644 index eb730d8..0000000 --- a/vim/config/plugins/gundo.vim +++ /dev/null @@ -1,5 +0,0 @@ -let g:gundo_right = 0 -let g:gundo_width = 35 -let g:gundo_preview_height = 10 - -autocmd FileType gundo setlocal nocursorcolumn diff --git a/vim/config/plugins/lightline.vim b/vim/config/plugins/lightline.vim index 53d8ab8..ab464e4 100644 --- a/vim/config/plugins/lightline.vim +++ b/vim/config/plugins/lightline.vim @@ -14,7 +14,6 @@ function! LLFilename() return \ fname == '__Tagbar__' ? g:lightline.fname : - \ fname =~ '__Gundo' ? '' : \ &ft == 'vimfiler' ? vimfiler#get_status_string() : \ &ft == 'unite' ? unite#get_status_string() : \ &ft == 'qf' ? '[Error/Location List]' : @@ -26,7 +25,7 @@ endfunction function! LLFugitive() try - if expand('%:t') !~? 'Tagbar\|Gundo' && &ft !~? 'vimfiler' && exists('*fugitive#head') + if expand('%:t') !~? 'Tagbar' && &ft !~? 'vimfiler' && exists('*fugitive#head') let mark = '' "edit here for cool mark let _ = fugitive#head() return strlen(_) ? mark._ : '' @@ -52,8 +51,6 @@ function! LLMode() let fname = expand('%:t') return fname == '__Tagbar__' ? 'Tagbar' : - \ fname == '__Gundo__' ? 'Gundo' : - \ fname == '__Gundo_Preview__' ? 'Gundo Preview' : \ &ft == 'unite' ? 'Unite' : \ &ft == 'vimfiler' ? 'VimFiler' : \ winwidth(0) > 60 ? lightline#mode() : '' diff --git a/vimrc b/vimrc index 513493e..b305734 100644 --- a/vimrc +++ b/vimrc @@ -63,7 +63,6 @@ endif if !has('python') - call add(pathogen_disabled, 'gundo.vim') call add(pathogen_disabled, 'MatchTagAlways') endif