Make sure vim-misc is installed, politely complain if it isn't

xolox · Aug 19, 2013 · 1e1a116 · 1e1a116
1 parent a04b3ab
commit 1e1a116
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/addon-info.json b/addon-info.json
@@ -0,0 +1 @@
+{"vim_script_nr": 3123, "dependencies": {"vim-misc": {}}, "homepage": "http://peterodding.com/code/vim/shell", "name": "vim-shell"}
diff --git a/autoload/xolox/shell.vim b/autoload/xolox/shell.vim
@@ -1,9 +1,9 @@
 " Vim auto-load script
 " Author: Peter Odding <peter@peterodding.com>
-" Last Change: June , 2013
+" Last Change: August 19, 2013
 " URL: http://peterodding.com/code/vim/shell/
 
-let g:xolox#shell#version = '0.13'
+let g:xolox#shell#version = '0.13.1'
 
 if !exists('s:fullscreen_enabled')
   let s:enoimpl = "%s() hasn't been implemented on your platform! %s"

diff --git a/doc/shell.txt b/doc/shell.txt
@@ -294,7 +294,7 @@ If you like the plug-in please vote for it on Vim Online [15].
                                                                 *shell-license*
 License ~
 
-This software is licensed under the MIT license [16]. © 2013 Peter Odding
+This software is licensed under the MIT license [16]. ÂŠ 2013 Peter Odding
 <peter@peterodding.com>.
 
 ===============================================================================

diff --git a/plugin/shell.vim b/plugin/shell.vim
@@ -1,6 +1,6 @@
 " Vim plug-in
 " Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 12, 2013
+" Last Change: August 19, 2013
 " URL: http://peterodding.com/code/vim/shell/
 
 " Support for automatic update using the GLVS plug-in.
@@ -11,6 +11,20 @@ if &cp || exists('g:loaded_shell')
   finish
 endif
 
+" Make sure vim-misc is installed. {{{1
+
+try
+  " The point of this code is to do something completely innocent while making
+  " sure the vim-misc plug-in is installed. We specifically don't use Vim's
+  " exists() function because it doesn't load auto-load scripts that haven't
+  " already been loaded yet (last tested on Vim 7.3).
+  call type(g:xolox#misc#version)
+catch
+  echomsg "Warning: The vim-shell plug-in requires the vim-misc plug-in which seems not to be installed! For more information please review the installation instructions in the readme (also available on the homepage and on GitHub). The vim-shell plug-in will now be disabled."
+  let g:loaded_shell = 1
+  finish
+endtry
+
 " Configuration defaults. {{{1
 
 if !exists('g:shell_fullscreen_always_on_top')