command-t 2.0 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9c92f460a44bb7554c990bf9d06c5f3b3ad8891
-  data.tar.gz: 27f3ef68e47d9621c0e4216ea8d6a10d435d0cab
+  metadata.gz: 9f43cff05f4b7fb5cee397afe9e655341ba56693
+  data.tar.gz: 45effde9a057610772730347288bee7ce50b771c
 SHA512:
-  metadata.gz: f9f0e3ace3dc7a0d2b1d991f3f8173a8e1bf702714bd3fc03b2016f5ce6099f3fd9f5bc00b5900bbda169064c5c11ea612464de42ee84385ed8cbf309310b0af
-  data.tar.gz: fc06e1678ac22c9b5ea73ec90a9bba6919fc7a3954b42e4aee2fc911e0a4445589bf772abd2a23918fe5da27fd3f9544169104f142ed64f9f1505000dbb41679
+  metadata.gz: d0bc741a72d54ab985c0aa56a3c3087415a33a5381bef81b8fb3b881fb1d2aa295d8e8f3bd3519fa0bac9dc2131ae3c71cc0324c85d68f296f0bee84dc9c80ee
+  data.tar.gz: faf635537a2f10b47cce6eb6f42f60d37e8aba84a7bbbaa9fd4f36f3ce52eaf6127ff42810899319fcf4481e77ebc147eff0eb7f3c0195ca43ac5ece051b40d3

data/README.txt

@@ -39,10 +39,6 @@ called. This means narrowing your search down by including some characters
 from the upper path components rather than just entering characters from the
 filename itself.
 
-Screencasts demonstrating the plug-in can be viewed at:
-
-  https://wincent.com/products/command-t
-
 
 REQUIREMENTS                                    *command-t-requirements*
 
@@ -182,13 +178,13 @@ If you manage your entire `~/.vim` folder using Git then you can add the
 Command-T repository as a submodule:
 
   cd ~/.vim
-  git submodule add git://git.wincent.com/command-t.git bundle/command-t
+  git submodule add https://github.com/wincent/command-t.git bundle/command-t
   git submodule init
 
 Or if you just wish to do a simple clone instead of using submodules:
 
   cd ~/.vim
-  git clone git://git.wincent.com/command-t.git bundle/command-t
+  git clone https://github.com/wincent/command-t.git bundle/command-t
 
 Once you have a local copy of the repository you can update it at any time
 with:
@@ -628,7 +624,7 @@ Following is a list of all available options:
       there is no limit on the number of cached directories.
 
                                                *g:CommandTMaxHeight*
-  |g:CommandTMaxHeight|                          number (default: 0)
+  |g:CommandTMaxHeight|                          number (default: 15)
 
       The maximum height in lines the match window is allowed to expand to.
       If set to 0, the window will occupy as much of the available space as
@@ -760,19 +756,20 @@ Following is a list of all available options:
       When this setting is off (the default) the match window will appear at
       the bottom so as to keep it near to the prompt. Turning it on causes the
       match window to appear at the top instead. This may be preferable if you
-      want the best match (usually the first one) to appear in a fixed location
-      on the screen rather than moving as the number of matches changes during
+      if you have |g:CommandTMatchWindowReverse| set to 0 and want the best
+      match (usually the first one) to appear in a fixed location on the
+      screen rather than moving as the number of matches changes during
       typing.
 
                                                 *g:CommandTMatchWindowReverse*
-  |g:CommandTMatchWindowReverse|                  boolean (default: 0)
+  |g:CommandTMatchWindowReverse|                  boolean (default: 1)
 
-      When this setting is off (the default) the matches will appear from
-      top to bottom with the topmost being selected. Turning it on causes the
-      matches to be reversed so the best match is at the bottom and the
-      initially selected match is the bottom most. This may be preferable if
-      you want the best match to appear in a fixed location on the screen
-      but still be near the prompt at the bottom.
+      When this setting is on (the default), matches will be shown in reverse
+      order, with the best match at the bottom (ie. closest to the prompt).
+      The initially selected match will be the bottom-most, which is
+      preferable if you want the best match to appear in a fixed location on
+      the screen (independently of the number of results). When set to 0,
+      matches will appear from top to bottom with the topmost being selected.
 
                                                 *g:CommandTTagIncludeFilenames*
   |g:CommandTTagIncludeFilenames|                 boolean (default: 0)
@@ -892,11 +889,10 @@ Following is a list of all available options:
       "ASCII-8BIT".
 
                                               *g:CommandTIgnoreSpaces*
-  |g:CommandTIgnoreSpaces|                      boolean (default: 0)
+  |g:CommandTIgnoreSpaces|                      boolean (default: 1)
 
-      When typing a search term into Command-T, use this option to have it
-      ignore spaces. Without this option set, it will search for literal
-      spaces inside file names.
+      When typing a search term into Command-T, ignore spaces. When set to 0,
+      Command-T will search for literal spaces inside file names.
 
 As well as the basic options listed above, there are a number of settings that
 can be used to override the default key mappings used by Command-T. For
@@ -1242,7 +1238,7 @@ kind of ongoing calibration will come quite naturally.
 Finally, it is important to be on a relatively recent version of Command-T to
 fully benefit from the available performance enhancements:
 
-- version 2.0a (not yet released) added the |g:CommandTRecursiveMatch| option
+- version 2.0 (December 2015) added the |g:CommandTRecursiveMatch| option
 - version 1.10 (July 2014) added the |g:CommandTIgnoreCase| and
   |g:CommandTSmartCase| options
 - version 1.9 (May 2014) tweaked memoization algorithm for a 10% speed boost
@@ -1307,19 +1303,19 @@ LustyExplorer is available from:
 
 DEVELOPMENT                                     *command-t-development*
 
-Development in progress can be inspected via the project's Git web-based
-repository browser at:
+Development in progress can be inspected at:
 
-  https://wincent.com/repos/command-t
+  https://github.com/wincent/command-t
 
 the clone URL for which is:
 
-  git://git.wincent.com/command-t.git
+  https://github.com/wincent/command-t.git
 
-A mirror exists on GitHub, which is automatically updated once per hour from
-the authoritative repository:
+Mirrors exist on GitLab and BitBucket, and are automatically updated once per
+hour:
 
-  https://github.com/wincent/command-t
+  https://gitlab.com/wincent/command-t
+  https://bitbucket.org/ghurrell/command-t
 
 Patches are welcome via the usual mechanisms (pull requests, email, posting to
 the project issue tracker etc).
@@ -1340,9 +1336,11 @@ WEBSITE                                         *command-t-website*
 
 The official website for Command-T is:
 
-  https://wincent.com/products/command-t
+  https://github.com/wincent/command-t
+
+The latest release will always be available from:
 
-The latest release will always be available from there.
+  https://github.com/wincent/command-t/releases
 
 A copy of each release is also available from the official Vim scripts site
 at:
@@ -1351,7 +1349,7 @@ at:
 
 Bug reports should be submitted to the issue tracker at:
 
-  https://wincent.com/issues
+  https://github.com/wincent/command-t/issues
 
 
 LICENSE                                         *command-t-license*
@@ -1381,6 +1379,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+3.0 (19 January 2015)
+
+- change |g:CommandTIgnoreSpaces| default value to 1.
+- change |g:CommandTMatchWindowReverse| default value to 1.
+- change |g:CommandTMaxHeight| default value to 15.
+- try harder to avoid scrolling other buffer when showing or hiding the match
+  listing
+
 2.0 (28 December 2015)
 
 - add |:CommandTIgnoreSpaces| option (patch from KJ Tsanaktsidis)

data/doc/command-t.txt

@@ -39,10 +39,6 @@ called. This means narrowing your search down by including some characters
 from the upper path components rather than just entering characters from the
 filename itself.
 
-Screencasts demonstrating the plug-in can be viewed at:
-
-  https://wincent.com/products/command-t
-
 
 REQUIREMENTS                                    *command-t-requirements*
 
@@ -182,13 +178,13 @@ If you manage your entire `~/.vim` folder using Git then you can add the
 Command-T repository as a submodule:
 
   cd ~/.vim
-  git submodule add git://git.wincent.com/command-t.git bundle/command-t
+  git submodule add https://github.com/wincent/command-t.git bundle/command-t
   git submodule init
 
 Or if you just wish to do a simple clone instead of using submodules:
 
   cd ~/.vim
-  git clone git://git.wincent.com/command-t.git bundle/command-t
+  git clone https://github.com/wincent/command-t.git bundle/command-t
 
 Once you have a local copy of the repository you can update it at any time
 with:
@@ -628,7 +624,7 @@ Following is a list of all available options:
       there is no limit on the number of cached directories.
 
                                                *g:CommandTMaxHeight*
-  |g:CommandTMaxHeight|                          number (default: 0)
+  |g:CommandTMaxHeight|                          number (default: 15)
 
       The maximum height in lines the match window is allowed to expand to.
       If set to 0, the window will occupy as much of the available space as
@@ -760,19 +756,20 @@ Following is a list of all available options:
       When this setting is off (the default) the match window will appear at
       the bottom so as to keep it near to the prompt. Turning it on causes the
       match window to appear at the top instead. This may be preferable if you
-      want the best match (usually the first one) to appear in a fixed location
-      on the screen rather than moving as the number of matches changes during
+      if you have |g:CommandTMatchWindowReverse| set to 0 and want the best
+      match (usually the first one) to appear in a fixed location on the
+      screen rather than moving as the number of matches changes during
       typing.
 
                                                 *g:CommandTMatchWindowReverse*
-  |g:CommandTMatchWindowReverse|                  boolean (default: 0)
+  |g:CommandTMatchWindowReverse|                  boolean (default: 1)
 
-      When this setting is off (the default) the matches will appear from
-      top to bottom with the topmost being selected. Turning it on causes the
-      matches to be reversed so the best match is at the bottom and the
-      initially selected match is the bottom most. This may be preferable if
-      you want the best match to appear in a fixed location on the screen
-      but still be near the prompt at the bottom.
+      When this setting is on (the default), matches will be shown in reverse
+      order, with the best match at the bottom (ie. closest to the prompt).
+      The initially selected match will be the bottom-most, which is
+      preferable if you want the best match to appear in a fixed location on
+      the screen (independently of the number of results). When set to 0,
+      matches will appear from top to bottom with the topmost being selected.
 
                                                 *g:CommandTTagIncludeFilenames*
   |g:CommandTTagIncludeFilenames|                 boolean (default: 0)
@@ -892,11 +889,10 @@ Following is a list of all available options:
       "ASCII-8BIT".
 
                                               *g:CommandTIgnoreSpaces*
-  |g:CommandTIgnoreSpaces|                      boolean (default: 0)
+  |g:CommandTIgnoreSpaces|                      boolean (default: 1)
 
-      When typing a search term into Command-T, use this option to have it
-      ignore spaces. Without this option set, it will search for literal
-      spaces inside file names.
+      When typing a search term into Command-T, ignore spaces. When set to 0,
+      Command-T will search for literal spaces inside file names.
 
 As well as the basic options listed above, there are a number of settings that
 can be used to override the default key mappings used by Command-T. For
@@ -1242,7 +1238,7 @@ kind of ongoing calibration will come quite naturally.
 Finally, it is important to be on a relatively recent version of Command-T to
 fully benefit from the available performance enhancements:
 
-- version 2.0a (not yet released) added the |g:CommandTRecursiveMatch| option
+- version 2.0 (December 2015) added the |g:CommandTRecursiveMatch| option
 - version 1.10 (July 2014) added the |g:CommandTIgnoreCase| and
   |g:CommandTSmartCase| options
 - version 1.9 (May 2014) tweaked memoization algorithm for a 10% speed boost
@@ -1307,19 +1303,19 @@ LustyExplorer is available from:
 
 DEVELOPMENT                                     *command-t-development*
 
-Development in progress can be inspected via the project's Git web-based
-repository browser at:
+Development in progress can be inspected at:
 
-  https://wincent.com/repos/command-t
+  https://github.com/wincent/command-t
 
 the clone URL for which is:
 
-  git://git.wincent.com/command-t.git
+  https://github.com/wincent/command-t.git
 
-A mirror exists on GitHub, which is automatically updated once per hour from
-the authoritative repository:
+Mirrors exist on GitLab and BitBucket, and are automatically updated once per
+hour:
 
-  https://github.com/wincent/command-t
+  https://gitlab.com/wincent/command-t
+  https://bitbucket.org/ghurrell/command-t
 
 Patches are welcome via the usual mechanisms (pull requests, email, posting to
 the project issue tracker etc).
@@ -1340,9 +1336,11 @@ WEBSITE                                         *command-t-website*
 
 The official website for Command-T is:
 
-  https://wincent.com/products/command-t
+  https://github.com/wincent/command-t
+
+The latest release will always be available from:
 
-The latest release will always be available from there.
+  https://github.com/wincent/command-t/releases
 
 A copy of each release is also available from the official Vim scripts site
 at:
@@ -1351,7 +1349,7 @@ at:
 
 Bug reports should be submitted to the issue tracker at:
 
-  https://wincent.com/issues
+  https://github.com/wincent/command-t/issues
 
 
 LICENSE                                         *command-t-license*
@@ -1381,6 +1379,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+3.0 (19 January 2015)
+
+- change |g:CommandTIgnoreSpaces| default value to 1.
+- change |g:CommandTMatchWindowReverse| default value to 1.
+- change |g:CommandTMaxHeight| default value to 15.
+- try harder to avoid scrolling other buffer when showing or hiding the match
+  listing
+
 2.0 (28 December 2015)
 
 - add |:CommandTIgnoreSpaces| option (patch from KJ Tsanaktsidis)

data/ruby/command-t/Makefile

@@ -11,12 +11,12 @@ ECHO = $(ECHO1:0=@echo)
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0
+topdir = /Users/glh/.rubies/ruby-2.0.0-p645/include/ruby-2.0.0
 hdrdir = $(topdir)
-arch_hdrdir = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/universal-darwin15
+arch_hdrdir = /Users/glh/.rubies/ruby-2.0.0-p645/include/ruby-2.0.0/x86_64-darwin15.2.0
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr
+prefix = $(DESTDIR)/Users/glh/.rubies/ruby-2.0.0-p645
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
@@ -32,7 +32,7 @@ vendorlibdir = $(vendordir)/$(ruby_version)
 vendordir = $(rubylibprefix)/vendor_ruby
 sitearchdir = $(sitelibdir)/$(sitearch)
 sitelibdir = $(sitedir)/$(ruby_version)
-sitedir = $(DESTDIR)/Library/Ruby/Site
+sitedir = $(rubylibprefix)/site_ruby
 rubyarchdir = $(rubylibdir)/$(arch)
 rubylibdir = $(rubylibprefix)/$(ruby_version)
 sitearchincludedir = $(includedir)/$(sitearch)
@@ -40,20 +40,20 @@ archincludedir = $(includedir)/$(arch)
 sitearchlibdir = $(libdir)/$(sitearch)
 archlibdir = $(libdir)/$(arch)
 ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(DESTDIR)/usr/share/man
+mandir = $(datarootdir)/man
 localedir = $(datarootdir)/locale
 libdir = $(exec_prefix)/lib
 psdir = $(docdir)
 pdfdir = $(docdir)
 dvidir = $(docdir)
 htmldir = $(docdir)
-infodir = $(DESTDIR)/usr/share/info
+infodir = $(datarootdir)/info
 docdir = $(datarootdir)/doc/$(PACKAGE)
 oldincludedir = $(DESTDIR)/usr/include
-includedir = $(DESTDIR)/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk$(prefix)/include
+includedir = $(prefix)/include
 localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
-sysconfdir = $(DESTDIR)/Library/Ruby/Site
+sysconfdir = $(prefix)/etc
 datadir = $(datarootdir)
 datarootdir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec
@@ -62,11 +62,11 @@ bindir = $(exec_prefix)/bin
 archdir = $(rubyarchdir)
 
 
-CC = xcrun clang
-CXX = xcrun clang++
-LIBRUBY = $(LIBRUBY_SO)
+CC = clang
+CXX = g++
+LIBRUBY = $(LIBRUBY_A)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_SHARED = 
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 empty =
 OUTFLAG = -o $(empty)
@@ -74,18 +74,18 @@ COUTFLAG = -o $(empty)
 
 RUBY_EXTCONF_H = 
 cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = 
-debugflags = -g
-warnflags = 
-CCDLFLAGS = 
-CFLAGS   = $(CCDLFLAGS)  -g -Os -pipe -DHAVE_GCC_SYNC_BUILTINS $(ARCH_FLAG)
+optflags = -O3 -fno-fast-math
+debugflags = -ggdb3
+warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
+CCDLFLAGS = -fno-common
+CFLAGS   = $(CCDLFLAGS) $(cflags)  -pipe $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     =  -DWATCHMAN_BUILD
-CPPFLAGS = -DHAVE_FCNTL_H -DHAVE_STDINT_H -DHAVE_SYS_ERRNO_H -DHAVE_SYS_SOCKET_H -DHAVE_RUBY_ST_H -DHAVE_ST_H -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS) $(ARCH_FLAG) -g -Os -pipe  $(ARCH_FLAG)
-ldflags  = -L. -L/usr/local/lib
-dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress 
-ARCH_FLAG =  -arch i386 -arch x86_64
+CPPFLAGS = -DHAVE_FCNTL_H -DHAVE_STDINT_H -DHAVE_SYS_ERRNO_H -DHAVE_SYS_SOCKET_H -DHAVE_RUBY_ST_H -DHAVE_ST_H -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT -I/usr/local/opt/openssl/include -I/usr/local/opt/readline/include -I/usr/local/opt/libyaml/include -I/usr/local/opt/gdbm/include $(DEFS) $(cppflags)
+CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG)
+ldflags  = -L. -fstack-protector -L/usr/local/opt/openssl/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libyaml/lib -L/usr/local/opt/gdbm/lib 
+dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -L/usr/local/opt/openssl/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libyaml/lib -L/usr/local/opt/gdbm/lib  
+ARCH_FLAG = 
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = $(CC) -dynamic -bundle
 LDSHAREDXX = $(CXX) -dynamic -bundle
@@ -93,13 +93,13 @@ AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby.2.0.0
+RUBY_SO_NAME = ruby
 RUBYW_INSTALL_NAME = 
 RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
 RUBYW_BASE_NAME = rubyw
 RUBY_BASE_NAME = ruby
 
-arch = universal-darwin15
+arch = x86_64-darwin15.2.0
 sitearch = $(arch)
 ruby_version = 2.0.0
 ruby = $(bindir)/ruby
@@ -109,8 +109,8 @@ ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/con
 RM = rm -f
 RM_RF = $(RUBY) -run -e rm -- -rf
 RMDIRS = rmdir -p
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
+MAKEDIRS = /usr/local/bin/gmkdir -p
+INSTALL = /usr/local/bin/ginstall -c
 INSTALL_PROG = $(INSTALL) -m 0755
 INSTALL_DATA = $(INSTALL) -m 644
 COPY = cp
@@ -120,8 +120,8 @@ TOUCH = exit >
 
 preload = 
 
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
+libpath = . $(libdir) /usr/local/opt/openssl/lib /usr/local/opt/readline/lib /usr/local/opt/libyaml/lib /usr/local/opt/gdbm/lib
+LIBPATH =  -L. -L$(libdir) -L/usr/local/opt/openssl/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libyaml/lib -L/usr/local/opt/gdbm/lib
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -132,7 +132,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lpthread  -lpthread -ldl -lobjc 
+LIBS =  -lpthread  -lpthread -ldl -lobjc 
 ORIG_SRCS = ext.c match.c matcher.c watchman.c
 SRCS = $(ORIG_SRCS) 
 OBJS = ext.o match.o matcher.o watchman.o

data/ruby/command-t/controller.rb

@@ -261,7 +261,7 @@ module CommandT
         :case_sensitive => case_sensitive?,
         :limit          => match_limit,
         :threads        => CommandT::Util.processor_count,
-        :ignore_spaces  => VIM::get_bool('g:CommandTIgnoreSpaces'),
+        :ignore_spaces  => VIM::get_bool('g:CommandTIgnoreSpaces', true),
         :recurse        => VIM::get_bool('g:CommandTRecursiveMatch', true),
       )
       @match_window.matches = @matches
@@ -307,7 +307,7 @@ module CommandT
       @match_window     = MatchWindow.new \
         :highlight_color      => VIM::get_string('g:CommandTHighlightColor'),
         :match_window_at_top  => VIM::get_bool('g:CommandTMatchWindowAtTop'),
-        :match_window_reverse => VIM::get_bool('g:CommandTMatchWindowReverse'),
+        :match_window_reverse => VIM::get_bool('g:CommandTMatchWindowReverse', true),
         :min_height           => min_height,
         :debounce_interval    => VIM::get_number('g:CommandTInputDebounce') || 50,
         :prompt               => prompt,
@@ -320,7 +320,7 @@ module CommandT
     end
 
     def max_height
-      @max_height ||= VIM::get_number('g:CommandTMaxHeight') || 0
+      @max_height ||= VIM::get_number('g:CommandTMaxHeight') || 15
     end
 
     def min_height

data/ruby/command-t/match.c

@@ -139,7 +139,7 @@ void calculate_match(VALUE str,
     m.max_score_per_char    = (1.0 / m.haystack_len + 1.0 / m.needle_len) / 2;
     m.always_show_dot_files = always_show_dot_files == Qtrue;
     m.never_show_dot_files  = never_show_dot_files == Qtrue;
-    m.case_sensitive        = case_sensitive;
+    m.case_sensitive        = (int)case_sensitive;
     m.recurse               = recurse == Qtrue;
 
     // calculate score

data/ruby/command-t/match_window.rb

@@ -23,15 +23,6 @@ module CommandT
       quoted_name = VIM::escape_for_single_quotes(options[:name])
       escaped_name = ::VIM::evaluate("fnameescape('#{quoted_name}')")
 
-      # save existing window dimensions so we can restore them later
-      @windows = (0..(::VIM::Window.count - 1)).map do |i|
-        OpenStruct.new(
-          :index  => i,
-          :height => ::VIM::Window[i].height,
-          :width  => ::VIM::Window[i].width
-        )
-      end
-
       set 'timeout', true        # ensure mappings timeout
       set 'hlsearch', false      # don't highlight search strings
       set 'insertmode', false    # don't make Insert mode the default
@@ -44,6 +35,36 @@ module CommandT
       set 'sidescrolloff', 0     # don't sidescroll automatically
       set 'updatetime', options[:debounce_interval]
 
+      # Save existing window views so we can restore them later.
+      current_window = ::VIM::evaluate('winnr()')
+      @windows = (0..(::VIM::Window.count - 1)).map do |i|
+        focus_window(i + 1)
+        view = ::VIM::evaluate('winsaveview()')
+        window = OpenStruct.new(
+          :index    => i,
+          :height   => ::VIM::Window[i].height,
+          :width    => ::VIM::Window[i].width,
+          :lnum     => view['lnum'],
+          :col      => view['col'],
+          :coladd   => view['coladd'],
+          :curswant => view['curswant'],
+          :topline  => view['topline'],
+          :topfill  => view['topfill'],
+          :leftcol  => view['leftcol'],
+          :skipcol  => view['skipcol'],
+        )
+
+        # When creating a split for the match window, move the cursor to the
+        # opposite side of the window's viewport to prevent unwanted scrolling.
+        boundary_line = options[:match_window_at_top] ?
+          ::VIM::evaluate("line('w$')") :
+          view['topline']
+        ::VIM::evaluate("winrestview({'lnum': #{boundary_line}})")
+
+        window
+      end
+      focus_window(current_window)
+
       # show match window
       split_location = options[:match_window_at_top] ? 'topleft' : 'botright'
       if ((number = buffer_number)) # still have buffer from last time
@@ -168,7 +189,7 @@ module CommandT
     end
 
     def unload
-      restore_window_dimensions
+      restore_window_views
       @settings.restore
       @prompt.dispose
       show_cursor
@@ -251,6 +272,10 @@ module CommandT
 
   private
 
+    def focus_window(number)
+      ::VIM::command("noautocmd #{number}wincmd w")
+    end
+
     def _next
       if @selection < [@window.height, @matches.length].min - 1
         @selection += 1
@@ -296,7 +321,7 @@ module CommandT
       lock
     end
 
-    def restore_window_dimensions
+    def restore_window_views
       # sort from tallest to shortest, tie-breaking on window width
       @windows.sort! do |a, b|
         order = b.height <=> a.height
@@ -310,13 +335,26 @@ module CommandT
       # starting with the tallest ensures that there are no constraints
       # preventing windows on the side of vertical splits from regaining
       # their original full size
+      current_window = ::VIM::evaluate('winnr()')
       @windows.each do |w|
         # beware: window may be nil
         if window = ::VIM::Window[w.index]
           window.height = w.height
           window.width  = w.width
+          focus_window(w.index + 1)
+          ::VIM::evaluate("winrestview({" +
+            "'lnum': #{w.lnum}," +
+            "'col': #{w.col}, " +
+            "'coladd': #{w.coladd}, " +
+            "'curswant': #{w.curswant}, " +
+            "'topline': #{w.topline}, " +
+            "'topfill': #{w.topfill}, " +
+            "'leftcol': #{w.leftcol}, " +
+            "'skipcol': #{w.skipcol}" +
+          "})")
         end
       end
+      focus_window(current_window)
     end
 
     def match_text_for_idx(idx)

data/ruby/command-t/matcher.c

@@ -81,9 +81,9 @@ VALUE CommandTMatcher_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 typedef struct {
-    int thread_count;
-    int thread_index;
-    int case_sensitive;
+    long thread_count;
+    long thread_index;
+    long case_sensitive;
     match_t *matches;
     long path_count;
     VALUE paths;

data/ruby/command-t/metadata.rb

@@ -0,0 +1,8 @@
+# This file was generated by extconf.rb
+module CommandT
+  module Metadata
+    EXPECTED_RUBY_VERSION = "2.0.0"
+    EXPECTED_RUBY_PATCHLEVEL = 645
+    UNKNOWN = false
+  end # module Metadata
+end # module CommandT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command-t
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '3.0'
 platform: ruby
 authors:
 - Greg Hurrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Command-T provides a fast, intuitive mechanism for opening files with a
@@ -44,6 +44,7 @@ files:
 - ruby/command-t/matcher.c
 - ruby/command-t/matcher.h
 - ruby/command-t/metadata/fallback.rb
+- ruby/command-t/metadata.rb
 - ruby/command-t/mru.rb
 - ruby/command-t/path_utilities.rb
 - ruby/command-t/prompt.rb
@@ -71,7 +72,7 @@ files:
 - doc/command-t.txt
 - doc/tags
 - plugin/command-t.vim
-homepage: https://wincent.com/products/command-t
+homepage: https://github.com/wincent/command-t
 licenses:
 - BSD
 metadata: {}