Reverting lazy-initialization code, pending investigation

This commit rolls back the recently-added lazy-initialization code due
to a report of a segfault; due to the fact that a lot of people use
Pathogen or similar to track the HEAD of master, I'd rather be
conservative about this and roll it back immediately, and then
investigate. The lazy-initialization code itself has been moved onto a
topic branch (lazy-initialization).

The bug report:

  https://wincent.com/issues/1837

Signed-off-by: Wincent Colaiuta <win@wincent.com>

.mailmap

@@ -1,2 +1 @@
-Kien Nguyen Duc <contact@ndkien.com>
 Sung Pae <sung@metablu.com>

doc/command-t.txt

@@ -566,7 +566,6 @@ Other contributors that have submitted patches include (in alphabetical
 order):
 
   Daniel Hahler
-  Kien Nguyen Duc
   Lucas de Vries
   Matthew Todd
   Mike Lundy
@@ -651,11 +650,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
-1.2.2 (not yet released)
-
-- perform Ruby initialization lazily on first use, minimizing impact on Vim
-  startup time (patch from Kien Nguyen Duc)
-
 1.2.1 (30 April 2011)
 
 - Remove duplicate copy of the documentation that was causing "Duplicate tag"

plugin/command-t.vim

@@ -48,7 +48,6 @@ endfunction
 
 function s:CommandTShowBufferFinder()
   if has('ruby')
-    call s:CommandTLazyInitialize()
     ruby $command_t.show_buffer_finder
   else
     call s:CommandTRubyWarning()
@@ -57,7 +56,6 @@ endfunction
 
 function s:CommandTShowFileFinder(arg)
   if has('ruby')
-    call s:CommandTLazyInitialize()
     ruby $command_t.show_file_finder
   else
     call s:CommandTRubyWarning()
@@ -66,42 +64,15 @@ endfunction
 
 function s:CommandTFlush()
   if has('ruby')
-    call s:CommandTLazyInitialize()
     ruby $command_t.flush
   else
     call s:CommandTRubyWarning()
   endif
 endfunction
 
-function s:CommandTLazyInitialize()
-  if !exists("g:command_t_initialized")
-    let g:command_t_initialized = 1
-    ruby << EOF
-      # require Ruby files
-      begin
-        # prepare controller
-        require 'command-t/vim'
-        require 'command-t/controller'
-        $command_t = CommandT::Controller.new
-      rescue LoadError
-        load_path_modified = false
-        ::VIM::evaluate('&runtimepath').to_s.split(',').each do |path|
-          lib = "#{path}/ruby"
-          if !$LOAD_PATH.include?(lib) and File.exist?(lib)
-            $LOAD_PATH << lib
-            load_path_modified = true
-          end
-        end
-        retry if load_path_modified
-
-        # could get here if C extension was not compiled, or was compiled
-        # for the wrong architecture or Ruby version
-        require 'command-t/stub'
-        $command_t = CommandT::Stub.new
-      end
-EOF
-  endif
-endfunction
+if !has('ruby')
+  finish
+endif
 
 function CommandTHandleKey(arg)
   ruby $command_t.handle_key
@@ -166,3 +137,28 @@ endfunction
 function CommandTCursorStart()
   ruby $command_t.cursor_start
 endfunction
+
+ruby << EOF
+  # require Ruby files
+  begin
+    # prepare controller
+    require 'command-t/vim'
+    require 'command-t/controller'
+    $command_t = CommandT::Controller.new
+  rescue LoadError
+    load_path_modified = false
+    ::VIM::evaluate('&runtimepath').to_s.split(',').each do |path|
+      lib = "#{path}/ruby"
+      if !$LOAD_PATH.include?(lib) and File.exist?(lib)
+        $LOAD_PATH << lib
+        load_path_modified = true
+      end
+    end
+    retry if load_path_modified
+
+    # could get here if C extension was not compiled, or was compiled
+    # for the wrong architecture or Ruby version
+    require 'command-t/stub'
+    $command_t = CommandT::Stub.new
+  end
+EOF