Merge branch 'master' of https://github.com/xolox/vim-misc

1 files changed, 10 insertions, 7 deletions

diff --git a/autoload/xolox/misc/option.vim b/autoload/xolox/misc/option.vim
index 8c6d63d..8727ea1 100644
--- a/autoload/xolox/misc/option.vim
+++ b/autoload/xolox/misc/option.vim
@@ -1,15 +1,18 @@
 " Vim auto-load script
 " Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 26, 2011
+" Last Change: June 27, 2011
 " URL: http://peterodding.com/code/vim/misc/
 
-function! xolox#misc#option#get(name, default)
-  if exists('g:' . a:name)
-    return eval('g:' . a:name)
-  elseif exists('b:' . a:name)
+function! xolox#misc#option#get(name, ...)
+  if exists('b:' . a:name)
+    " Buffer local variable.
     return eval('b:' . a:name)
-  else
-    return a:default
+  elseif exists('g:' . a:name)
+    " Global variable.
+    return eval('g:' . a:name)
+  elseif exists('a:1')
+    " Default value.
+    return a:1
   endif
 endfunction