Add a small delay when search is interrupted

Search is interrupted when the query string has changed. This frequently
happens when the user is actively typing in a query. This (rather
arbitrary) delay is introduced not to start the next search immediately,
which is likely to be interrupted as well. The result of it is that fzf
feels more responsive.

README.md

@@ -24,11 +24,24 @@ git clone https://github.com/junegunn/fzf.git ~/.fzf
 ~/.fzf/install
 ```
 
+In case you don't have git installed:
+
+```sh
+mkdir -p ~/.fzf
+curl -L https://github.com/junegunn/fzf/archive/master.tar.gz |
+    tar xz --strip-components 1 -C ~/.fzf
+~/.fzf/install
+```
+
 The script will setup:
 
-- `fzf` executable
+- `fzf` function (bash, zsh, fish)
-- Key bindings (`CTRL-T`, `CTRL-R`, and `ALT-C`) for bash and zsh
+- Key bindings (`CTRL-T`, `CTRL-R`, and `ALT-C`) (bash, zsh, fish)
-- Fuzzy auto-completion for bash
+- Fuzzy auto-completion (bash)
+
+If you don't use any of the aforementioned shells, you have to manually place
+fzf executable in a directory included in `$PATH`. Key bindings and
+auto-completion will not be available in that case.
 
 ### Install as Vim plugin
 
@@ -47,22 +60,33 @@ Usage
 ```
 usage: fzf [options]
 
-  Options
+  Search
-    -m, --multi          Enable multi-select
     -x, --extended       Extended-search mode
     -e, --extended-exact Extended-search mode (exact match)
-    -q, --query=STR      Initial query
-    -f, --filter=STR     Filter mode. Do not start interactive finder.
-    -n, --nth=[-]N       Match only in the N-th token of the item
-    -d, --delimiter=STR  Field delimiter regex for --nth (default: AWK-style)
-    -s, --sort=MAX       Maximum number of matched items to sort (default: 1000)
-    +s, --no-sort        Do not sort the result. Keep the sequence unchanged.
     -i                   Case-insensitive match (default: smart-case match)
     +i                   Case-sensitive match
+    -n, --nth=N[,..]     Comma-separated list of field index expressions
+                         for limiting search scope. Each can be a non-zero
+                         integer or a range expression ([BEGIN]..[END])
+    -d, --delimiter=STR  Field delimiter regex for --nth (default: AWK-style)
+
+  Search result
+    -s, --sort=MAX       Maximum number of matched items to sort (default: 1000)
+    +s, --no-sort        Do not sort the result. Keep the sequence unchanged.
+
+  Interface
+    -m, --multi          Enable multi-select with tab/shift-tab
+        --no-mouse       Disable mouse
     +c, --no-color       Disable colors
     +2, --no-256         Disable 256-color
         --black          Use black background
-        --no-mouse       Disable mouse
+        --reverse        Reverse orientation
+
+  Scripting
+    -q, --query=STR      Start the finder with the given query
+    -1, --select-1       Automatically select the only match
+    -0, --exit-0         Exit immediately when there's no match
+    -f, --filter=STR     Filter mode. Do not start interactive finder.
 
   Environment variables
     FZF_DEFAULT_COMMAND  Default command to use when input is tty
@@ -100,6 +124,7 @@ The following readline key bindings should also work as expected.
 
 - CTRL-A / CTRL-E
 - CTRL-B / CTRL-F
+- CTRL-H / CTRL-D
 - CTRL-W / CTRL-U / CTRL-Y
 - ALT-B / ALT-F
 
@@ -133,10 +158,13 @@ Useful examples
 ---------------
 
 ```sh
-# vimf - Open selected file in Vim
+# fe [FUZZY PATTERN] - Open the selected file with the default editor
-vimf() {
+#   - Bypass fuzzy finder if there's only one match (--select-1)
+#   - Exit if there's no match (--exit-0)
+fe() {
   local file
-  file=$(fzf --query="$1") && vim "$file"
+  file=$(fzf --query="$1" --select-1 --exit-0)
+  [ -n "$file" ] && ${EDITOR:-vim} "$file"
 }
 
 # fd - cd to selected directory
@@ -147,76 +175,25 @@ fd() {
   cd "$dir"
 }
 
-# fda - including hidden directories
-fda() {
-  local dir
-  dir=$(find ${1:-.} -type d 2> /dev/null | fzf +m) && cd "$dir"
-}
-
 # fh - repeat history
 fh() {
-  eval $(history | fzf +s | sed 's/ *[0-9]* *//')
+  eval $(([ -n "$ZSH_NAME" ] && fc -l 1 || history) | fzf +s | sed 's/ *[0-9]* *//')
 }
 
 # fkill - kill process
 fkill() {
   ps -ef | sed 1d | fzf -m | awk '{print $2}' | xargs kill -${1:-9}
 }
-
-# fbr - checkout git branch
-fbr() {
-  local branches branch
-  branches=$(git branch) &&
-  branch=$(echo "$branches" | fzf +s +m) &&
-  git checkout $(echo "$branch" | sed "s/.* //")
-}
-
-# fco - checkout git commit
-fco() {
-  local commits commit
-  commits=$(git log --pretty=oneline --abbrev-commit --reverse) &&
-  commit=$(echo "$commits" | fzf +s +m -e) &&
-  git checkout $(echo "$commit" | sed "s/ .*//")
-}
-
-# ftags - search ctags
-ftags() {
-  local line
-  [ -e tags ] &&
-    line=$(grep -v "^!" tags | cut -f1-3 | cut -c1-80 | fzf --nth=1) &&
-    $EDITOR $(cut -f2 <<< "$line")
-}
-
-# fq1 [QUERY]
-# - Immediately select the file when there's only one match.
-#   If not, start the fuzzy finder as usual.
-fq1() {
-  local lines
-  lines=$(fzf --filter="$1" --no-sort)
-  if [ -z "$lines" ]; then
-    return 1
-  elif [ $(wc -l <<< "$lines") -eq 1 ]; then
-    echo "$lines"
-  else
-    echo "$lines" | fzf --query="$1"
-  fi
-}
-
-# fe [QUERY]
-# - Open the selected file with the default editor
-#   (Bypass fuzzy finder when there's only one match)
-fe() {
-  local file
-  file=$(fq1 "$1") && ${EDITOR:-vim} "$file"
-}
 ```
 
+For more examples, see [the wiki
+page](https://github.com/junegunn/fzf/wiki/examples).
+
 Key bindings for command line
 -----------------------------
 
-The install script will setup the following key bindings.
+The install script will setup the following key bindings for bash, zsh, and
-
+fish.
-### bash/zsh
 
 - `CTRL-T` - Paste the selected file path(s) into the command line
 - `CTRL-R` - Paste the selected command from history into the command line
@@ -226,7 +203,13 @@ If you're on a tmux session, `CTRL-T` will launch fzf in a new split-window. You
 may disable this tmux integration by setting `FZF_TMUX` to 0, or change the
 height of the window with `FZF_TMUX_HEIGHT` (e.g. `20`, `50%`).
 
-The source code can be found in `~/.fzf.bash` and in `~/.fzf.zsh`.
+If you use vi mode on bash, you need to add `set -o vi` *before* `source
+~/.fzf.bash` in your .bashrc, so that it correctly sets up key bindings for vi
+mode.
+
+If you want to customize the key bindings, consider editing the
+installer-generated source code: `~/.fzf.bash`, `~/.fzf.zsh`, and
+`~/.config/fish/functions/fzf_key_bindings.fish`.
 
 Auto-completion
 ---------------
@@ -304,7 +287,7 @@ TODO :smiley:
 Usage as Vim plugin
 -------------------
 
-(fzf is a command-line utility, naturally it is only accessible in terminal Vim)
+(Note: To use fzf in GVim, an external terminal emulator is required.)
 
 ### `:FZF[!]`
 
@@ -328,6 +311,17 @@ If you're on a tmux session, `:FZF` will launch fzf in a new split-window whose
 height can be adjusted with `g:fzf_tmux_height` (default: '40%'). However, the
 bang version (`:FZF!`) will always start in fullscreen.
 
+In GVim, you need an external terminal emulator to start fzf with. `xterm`
+command is used by default, but you can customize it with `g:fzf_launcher`.
+
+```vim
+" This is the default. %s is replaced with fzf command
+let g:fzf_launcher = 'xterm -e bash -ic %s'
+
+" Use urxvt instead
+let g:fzf_launcher = 'urxvt -geometry 120x30 -e sh -c %s'
+```
+
 ### `fzf#run([options])`
 
 For more advanced uses, you can call `fzf#run()` function which returns the list
@@ -336,14 +330,16 @@ of the selected items.
 `fzf#run()` may take an options-dictionary:
 
 | Option name     | Type          | Description                                                        |
-| ----------- | ------------- | ------------------------------------------------------------------- |
+| --------------- | ------------- | ------------------------------------------------------------------ |
 | `source`        | string        | External command to generate input to fzf (e.g. `find .`)          |
 | `source`        | list          | Vim list as input to fzf                                           |
 | `sink`          | string        | Vim command to handle the selected item (e.g. `e`, `tabe`)         |
 | `sink`          | funcref       | Reference to function to process each selected item                |
 | `options`       | string        | Options to fzf                                                     |
 | `dir`           | string        | Working directory                                                  |
-| `tmux`      | number/string | Use tmux split if possible with the given height (e.g. `20`, `50%`) |
+| `tmux_width`    | number/string | Use tmux vertical split with the given height (e.g. `20`, `50%`)   |
+| `tmux_height`   | number/string | Use tmux horizontal split with the given height (e.g. `20`, `50%`) |
+| `launcher`      | string        | External terminal emulator to start fzf with (Only used in GVim)   |
 
 #### Examples
 
@@ -371,7 +367,8 @@ nnoremap <silent> <Leader>C :call fzf#run({
 \         "substitute(fnamemodify(v:val, ':t'), '\\..\\{-}$', '', '')"),
 \   'sink':       'colo',
 \   'options':    '+m',
-\   'tmux':    15
+\   'tmux_width': 20,
+\   'launcher':   'xterm -geometry 20x30 -e bash -ic %s'
 \ })<CR>
 ```
 
@@ -380,25 +377,29 @@ handy mapping that selects an open buffer.
 
 ```vim
 " List of buffers
-function! g:buflist()
+function! BufList()
   redir => ls
   silent ls
   redir END
   return split(ls, '\n')
 endfunction
 
-function! g:bufopen(e)
+function! BufOpen(e)
   execute 'buffer '. matchstr(a:e, '^[ 0-9]*')
 endfunction
 
 nnoremap <silent> <Leader><Enter> :call fzf#run({
-\   'source':  g:buflist(),
+\   'source':      reverse(BufList()),
-\   'sink':    function('g:bufopen'),
+\   'sink':        function('BufOpen'),
-\   'options': '+m +s',
+\   'options':     '+m',
-\   'tmux':    15
+\   'tmux_height': '40%'
 \ })<CR>
 ```
 
+### Articles
+
+- [fzf+vim+tmux](http://junegunn.kr/2014/04/fzf+vim+tmux)
+
 Tips
 ----
 
@@ -431,6 +432,113 @@ This limit can be adjusted with `-s` option, or with the environment variable
 export FZF_DEFAULT_OPTS="--sort 20000"
 ```
 
+### Respecting `.gitignore`, `.hgignore`, and `svn:ignore`
+
+[ag](https://github.com/ggreer/the_silver_searcher) or
+[pt](https://github.com/monochromegane/the_platinum_searcher) will do the
+filtering:
+
+```sh
+# Feed the output of ag into fzf
+ag -l -g "" | fzf
+
+# Setting ag as the default source for fzf
+export FZF_DEFAULT_COMMAND='ag -l -g ""'
+
+# Now fzf (w/o pipe) will use ag instead of find
+fzf
+```
+
+### `git ls-tree` for fast traversal
+
+If you're running fzf in a large git repository, `git ls-tree` can boost up the
+speed of the traversal.
+
+```sh
+# Copy the original fzf function to __fzf
+declare -f __fzf > /dev/null ||
+  eval "$(echo "__fzf() {"; declare -f fzf | grep -v '^{' | tail -n +2)"
+
+# Use git ls-tree when possible
+fzf() {
+  if [ -n "$(git rev-parse HEAD 2> /dev/null)" ]; then
+    FZF_DEFAULT_COMMAND="git ls-tree -r --name-only HEAD" __fzf "$@"
+  else
+    __fzf "$@"
+  fi
+}
+```
+
+### Using fzf with tmux splits
+
+It isn't too hard to write your own fzf-tmux combo like the default
+CTRL-T key binding. (Or is it?)
+
+```sh
+# This is a helper function that splits the current pane to start the given
+# command ($1) and sends its output back to the original pane with any number of
+# optional keys (shift; $*).
+fzf_tmux_helper() {
+  [ -n "$TMUX_PANE" ] || return
+  local cmd=$1
+  shift
+  tmux split-window -p 40 \
+    "bash -c \"\$(tmux send-keys -t $TMUX_PANE \"\$(source ~/.fzf.bash; $cmd)\" $*)\""
+}
+
+# This is the function we are going to run in the split pane.
+# - "find" to list the directories
+# - "sed" will escape spaces in the paths.
+# - "paste" will join the selected paths into a single line
+fzf_tmux_dir() {
+  fzf_tmux_helper \
+    'find * -path "*/\.*" -prune -o -type d -print 2> /dev/null |
+     fzf --multi |
+     sed "s/ /\\\\ /g" |
+     paste -sd" " -' Space
+}
+
+# Bind CTRL-X-CTRL-D to fzf_tmux_dir
+bind '"\C-x\C-d": "$(fzf_tmux_dir)\e\C-e"'
+```
+
+### Fish shell
+
+It's [a known bug of fish](https://github.com/fish-shell/fish-shell/issues/1362)
+that it doesn't allow reading from STDIN in command substitution, which means
+simple `vim (fzf)` won't work as expected. The workaround is to store the result
+of fzf to a temporary file.
+
+```sh
+function vimf
+  if fzf > $TMPDIR/fzf.result
+    vim (cat $TMPDIR/fzf.result)
+  end
+end
+
+function fe
+  set tmp $TMPDIR/fzf.result
+  fzf --query="$argv[1]" --select-1 --exit-0 > $tmp
+  if [ (cat $tmp | wc -l) -gt 0 ]
+    vim (cat $tmp)
+  end
+end
+```
+
+### Windows
+
+fzf works on [Cygwin](http://www.cygwin.com/) and
+[MSYS2](http://sourceforge.net/projects/msys2/). You may need to use `--black`
+option on MSYS2 to avoid rendering issues.
+
+### Handling UTF-8 NFD paths on OSX
+
+Use iconv to convert NFD paths to NFC:
+
+```sh
+find . | iconv -f utf-8-mac -t utf8//ignore | fzf
+```
+
 License
 -------
 

fzf

@@ -7,7 +7,7 @@
 #  / __/ / /_/ __/
 # /_/   /___/_/    Fuzzy finder for your shell
 #
-# Version: 0.8.2 (March 30, 2014)
+# Version: 0.8.5 (Jun 15, 2014)
 #
 # Author:  Junegunn Choi
 # URL:     https://github.com/junegunn/fzf
@@ -50,8 +50,8 @@ end
 
 class FZF
   C = Curses
-  attr_reader :rxflag, :sort, :nth, :color, :black, :ansi256,
+  attr_reader :rxflag, :sort, :nth, :color, :black, :ansi256, :reverse,
-              :mouse, :multi, :query, :filter, :extended
+              :mouse, :multi, :query, :select1, :exit0, :filter, :extended
 
   class AtomicVar
     def initialize value
@@ -83,9 +83,12 @@ class FZF
     @multi    = false
     @mouse    = true
     @extended = nil
+    @select1  = false
+    @exit0    = false
     @filter   = nil
     @nth      = nil
     @delim    = nil
+    @reverse  = false
 
     argv =
       if opts = ENV['FZF_DEFAULT_OPTS']
@@ -96,7 +99,7 @@ class FZF
       end
     while o = argv.shift
       case o
-      when '--version'           then version
+      when '--version'           then FZF.version
       when '-h', '--help'        then usage 0
       when '-m', '--multi'       then @multi    = true
       when '+m', '--no-multi'    then @multi    = false
@@ -112,7 +115,13 @@ class FZF
       when       '--no-black'    then @black    = false
       when       '--mouse'       then @mouse    = true
       when       '--no-mouse'    then @mouse    = false
+      when       '--reverse'     then @reverse  = true
+      when       '--no-reverse'  then @reverse  = false
       when '+s', '--no-sort'     then @sort     = nil
+      when '-1', '--select-1'    then @select1  = true
+      when '+1', '--no-select-1' then @select1  = false
+      when '-0', '--exit-0'      then @exit0    = true
+      when '+0', '--no-exit-0'   then @exit0    = false
       when '-q', '--query'
         usage 1, 'query string required' unless query = argv.shift
         @query = AtomicVar.new query.dup
@@ -124,11 +133,10 @@ class FZF
       when /^-f(.*)$/, /^--filter=(.*)$/
         @filter = $1
       when '-n', '--nth'
-        usage 1, 'field number required' unless nth = argv.shift
+        usage 1, 'field expression required' unless nth = argv.shift
-        usage 1, 'invalid field number' if nth.to_i == 0
+        @nth = parse_nth nth
-        @nth = nth.to_i
+      when /^-n([0-9,-\.]+)$/, /^--nth=([0-9,-\.]+)$/
-      when /^-n(-?[1-9][0-9]*)$/, /^--nth=(-?[1-9][0-9]*)$/
+        @nth = parse_nth $1
-        @nth = $1.to_i
       when '-d', '--delimiter'
         usage 1, 'delimiter required' unless delim = argv.shift
         @delim = FZF.build_delim_regex delim
@@ -169,6 +177,24 @@ class FZF
     end
   end
 
+  def parse_nth nth
+    nth.split(',').map { |expr|
+      x = proc { usage 1, "invalid field expression: #{expr}" }
+      first, second = expr.split('..', 2)
+      x.call if !first.empty? && first.to_i == 0 ||
+        second && !second.empty? && (second.to_i == 0 || second.include?('.'))
+
+      first  = first.empty? ? 1 : first.to_i
+      second = case second
+               when nil then first
+               when ''  then -1
+               else second.to_i
+               end
+
+      Range.new(*[first, second].map { |e| e > 0 ? e - 1 : e })
+    }
+  end
+
   def FZF.build_delim_regex delim
     Regexp.compile(delim) rescue (delim = Regexp.escape(delim))
     Regexp.compile "(?:.*?#{delim})|(?:.+?$)"
@@ -176,29 +202,48 @@ class FZF
 
   def start
     if @filter
-      start_reader(false).join
+      start_reader.join
       filter_list @new
     else
-      @stdout = $stdout.clone
+      start_reader
-      $stdout.reopen($stderr)
+      emit(:key) { q = @query.get; [q, q.length] } unless empty = @query.empty?
+      if @select1 || @exit0
+        start_search do |loaded, matches|
+          len = empty ? @count.get : matches.length
+          if loaded
+            if @select1 && len == 1
+              puts empty ? matches.first : matches.first.first
+              exit 0
+            elsif @exit0 && len == 0
+              exit 0
+            end
+          end
 
-      start_reader true
+          if loaded || len > 1
-      init_screen
             start_renderer
+            Thread.new { start_loop }
+          end
+        end
+
+        sleep
+      else
         start_search
+        start_renderer
         start_loop
       end
     end
+  end
 
   def filter_list list
-    matches = get_matcher.match(list, @filter, '', '')
+    matches = matcher.match(list, @filter, '', '')
     if @sort && matches.length <= @sort
-      matches = sort_by_rank(matches)
+      matches = FZF.sort(matches)
     end
     matches.each { |m| puts m.first }
   end
 
-  def get_matcher
+  def matcher
+    @matcher ||=
       if @extended
         ExtendedFuzzyMatcher.new @rxflag, @extended, @nth, @delim
       else
@@ -206,37 +251,67 @@ class FZF
       end
   end
 
+  class << self
     def version
       File.open(__FILE__, 'r') do |f|
         f.each_line do |line|
           if line =~ /Version: (.*)/
-          $stdout.puts "fzf " << $1
+            $stdout.puts 'fzf ' << $1
             exit
           end
         end
       end
     end
 
+    def sort list
+      list.sort_by { |tuple| rank tuple }
+    end
+
+    def rank tuple
+      line, offsets = tuple
+      matchlen = 0
+      pe = 0
+      offsets.sort.each do |pair|
+        b, e = pair
+        b    = pe if pe > b
+        pe   = e  if e > pe
+        matchlen += e - b if e > b
+      end
+      [matchlen, line.length, line]
+    end
+  end
+
   def usage x, message = nil
     $stderr.puts message if message
     $stderr.puts %[usage: fzf [options]
 
-  Options
+  Search
-    -m, --multi          Enable multi-select
     -x, --extended       Extended-search mode
     -e, --extended-exact Extended-search mode (exact match)
-    -q, --query=STR      Initial query
-    -f, --filter=STR     Filter mode. Do not start interactive finder.
-    -n, --nth=[-]N       Match only in the N-th token of the item
-    -d, --delimiter=STR  Field delimiter regex for --nth (default: AWK-style)
-    -s, --sort=MAX       Maximum number of matched items to sort (default: 1000)
-    +s, --no-sort        Do not sort the result. Keep the sequence unchanged.
     -i                   Case-insensitive match (default: smart-case match)
     +i                   Case-sensitive match
+    -n, --nth=N[,..]     Comma-separated list of field index expressions
+                         for limiting search scope. Each can be a non-zero
+                         integer or a range expression ([BEGIN]..[END])
+    -d, --delimiter=STR  Field delimiter regex for --nth (default: AWK-style)
+
+  Search result
+    -s, --sort=MAX       Maximum number of matched items to sort (default: 1000)
+    +s, --no-sort        Do not sort the result. Keep the sequence unchanged.
+
+  Interface
+    -m, --multi          Enable multi-select with tab/shift-tab
+        --no-mouse       Disable mouse
     +c, --no-color       Disable colors
     +2, --no-256         Disable 256-color
         --black          Use black background
-        --no-mouse       Disable mouse
+        --reverse        Reverse orientation
+
+  Scripting
+    -q, --query=STR      Start the finder with the given query
+    -1, --select-1       Automatically select the only match
+    -0, --exit-0         Exit immediately when there's no match
+    -f, --filter=STR     Filter mode. Do not start interactive finder.
 
   Environment variables
     FZF_DEFAULT_COMMAND  Default command to use when input is tty
@@ -244,121 +319,6 @@ class FZF
     exit x
   end
 
-  case RUBY_PLATFORM
-  when /darwin/
-    module UConv
-      CHOSUNG   = 0x1100
-      JUNGSUNG  = 0x1161
-      JONGSUNG  = 0x11A7
-      CHOSUNGS  = 19
-      JUNGSUNGS = 21
-      JONGSUNGS = 28
-      JJCOUNT   = JUNGSUNGS * JONGSUNGS
-      NFC_BEGIN = 0xAC00
-      NFC_END   = NFC_BEGIN + CHOSUNGS * JUNGSUNGS * JONGSUNGS
-
-      def self.nfd str
-        str.split(//).map do |c|
-          cp = c.ord
-          if cp >= NFC_BEGIN && cp < NFC_END
-            chr = ''
-            idx  = cp - NFC_BEGIN
-            cho  = CHOSUNG  + idx / JJCOUNT
-            jung = JUNGSUNG + (idx % JJCOUNT) / JONGSUNGS
-            jong = JONGSUNG + idx % JONGSUNGS
-            chr << cho << jung
-            chr << jong if jong != JONGSUNG
-            chr
-          else
-            c
-          end
-        end
-      end
-
-      def self.to_nfc arr
-        [NFC_BEGIN + arr[0] * JJCOUNT +
-         (arr[1] || 0) * JONGSUNGS +
-         (arr[2] || 0)].pack('U*')
-      end
-
-      if String.method_defined?(:each_char)
-        def self.split str
-          str.each_char.to_a
-        end
-      else
-        def self.split str
-          str.split('')
-        end
-      end
-
-      def self.nfc str, offsets = []
-        ret  = ''
-        omap = []
-        pend = []
-        split(str).each_with_index do |c, idx|
-          cp =
-            begin
-              c.ord
-            rescue Exception
-              next
-            end
-          omap << ret.length
-          unless pend.empty?
-            if cp >= JUNGSUNG && cp < JUNGSUNG + JUNGSUNGS
-              pend << cp - JUNGSUNG
-              next
-            elsif cp >= JONGSUNG && cp < JONGSUNG + JONGSUNGS
-              pend << cp - JONGSUNG
-              next
-            else
-              omap[-1] = omap[-1] + 1
-              ret << to_nfc(pend)
-              pend.clear
-            end
-          end
-          if cp >= CHOSUNG && cp < CHOSUNG + CHOSUNGS
-            pend << cp - CHOSUNG
-          else
-            ret << c
-          end
-        end
-        ret << to_nfc(pend) unless pend.empty?
-        return [ret,
-                offsets.map { |pair|
-                  b, e = pair
-                  [omap[b] || 0, omap[e] || ((omap.last || 0) + 1)] }]
-      end
-    end
-
-    def convert_item item
-      UConv.nfc(*item)
-    end
-
-    class Matcher
-      def query_chars q
-        UConv.nfd(q)
-      end
-
-      def sanitize q
-        UConv.nfd(q).join
-      end
-    end
-  else
-    def convert_item item
-      item
-    end
-
-    class Matcher
-      def query_chars q
-        q.split(//)
-      end
-
-      def sanitize q
-        q
-      end
-    end
-  end
-
   def emit event
     @mtx.synchronize do
       @events[event] = yield
@@ -367,7 +327,11 @@ class FZF
   end
 
   def max_items; C.lines - 2; end
-  def cursor_y;  C.lines - 1; end
+
+  def cursor_y offset = 0
+    @reverse ? (offset) : (C.lines - 1 - offset)
+  end
+
   def cprint str, col
     C.attron(col) do
       addstr_safe str
@@ -387,7 +351,7 @@ class FZF
   end
 
   def print_info msg = nil
-    C.setpos cursor_y - 1, 0
+    C.setpos cursor_y(1), 0
     C.clrtoeol
     prefix =
       if spinner = @spinner.first
@@ -477,21 +441,6 @@ class FZF
     C.attroff color(:chosen, true) if chosen
   end
 
-  def sort_by_rank list
-    list.sort_by { |tuple|
-      line, offsets = tuple
-      matchlen = 0
-      pe = nil
-      offsets.sort.each do |pair|
-        b, e = pair
-        b    = pe if pe && pe > b
-        pe   = e
-        matchlen += e - b
-      end
-      [matchlen, line.length, line]
-    }
-  end
-
   AFTER_1_9 = RUBY_VERSION.split('.').map { |e| e.rjust(3, '0') }.join >= '001009'
 
   if AFTER_1_9
@@ -504,7 +453,7 @@ class FZF
       width = width str
       diff  = 0
       while width > len
-        width -= (left ? str[0, 1] : str[-1, 1]) =~ @@wrx ? 2 : 1
+        width -= ((left ? str[0, 1] : str[-1, 1]) =~ @@wrx ? 2 : 1) rescue 1
         str    = left ? str[1..-1] : str[0...-1]
         diff  += 1
       end
@@ -538,6 +487,9 @@ class FZF
   end
 
   def init_screen
+    @stdout = $stdout.clone
+    $stdout.reopen($stderr)
+
     C.init_screen
     C.mousemask C::ALL_MOUSE_EVENTS if @mouse
     C.start_color
@@ -595,7 +547,7 @@ class FZF
     C.refresh
   end
 
-  def start_reader curses
+  def start_reader
     stream =
       if @source.tty?
         if default_command = ENV['FZF_DEFAULT_COMMAND']
@@ -614,13 +566,12 @@ class FZF
         emit(:new) { @new << line.chomp }
       end
       emit(:loaded) { true }
-      @spinner.clear if curses
+      @spinner.clear if @spinner
     end
   end
 
-  def start_search
+  def start_search &callback
-    matcher  = get_matcher
+    Thread.new do
-    searcher = Thread.new {
       lists   = []
       events  = {}
       fcache  = {}
@@ -659,7 +610,7 @@ class FZF
           progress   = 0
           started_at = Time.now
 
-          if new_search && !lists.empty?
+          if updated = new_search && !lists.empty?
             q, cx = events.delete(:key) || [q, 0]
             empty = matcher.empty?(q)
             unless matches = fcache[q]
@@ -678,10 +629,13 @@ class FZF
                 found.concat(q.empty? ? list :
                              matcher.match(list, q, q[0, cx], q[cx..-1]))
               end
-              next if skip
+              if skip
+                sleep 0.1
+                next
+              end
               matches = @sort ? found : found.reverse
               if !empty && @sort && matches.length <= @sort
-                matches = sort_by_rank(matches)
+                matches = FZF.sort(matches)
               end
               fcache[q] = matches
             end
@@ -690,6 +644,10 @@ class FZF
             @matches.set matches
           end#new_search
 
+          callback = nil if callback &&
+                            (updated || events[:loaded]) &&
+                            callback.call(events[:loaded], matches)
+
           # This small delay reduces the number of partial lists
           sleep((delay = [20, delay + 5].min) * 0.01) unless user_input
 
@@ -698,7 +656,7 @@ class FZF
       rescue Exception => e
         @main.raise e
       end
-    }
+    end
   end
 
   def pick
@@ -714,7 +672,7 @@ class FZF
       # Wipe
       if items.length < @plcount
         @plcount.downto(items.length) do |idx|
-          C.setpos cursor_y - idx - 2, 0
+          C.setpos cursor_y(idx + 2), 0
           C.clrtoeol
         end
       end
@@ -729,10 +687,10 @@ class FZF
       }
       items.each_with_index do |item, idx|
         next unless wipe || cleanse.include?(idx)
-        row           = cursor_y - idx - 2
+        row           = cursor_y(idx + 2)
         chosen        = idx == vcursor
         selected      = @selects.include?([*item][0])
-        line, offsets = convert_item item
+        line, offsets = item
         tokens        = format line, maxc, offsets
         print_item row, tokens, chosen, selected
       end
@@ -742,6 +700,8 @@ class FZF
   end
 
   def start_renderer
+    init_screen
+
     Thread.new do
       begin
         while blk = @queue.shift
@@ -849,7 +809,7 @@ class FZF
 
       ord =
         case read_nb(1, :esc)
-        when 91
+        when 91, 79
           case read_nb(1, nil)
           when 68 then ctrl(:b)
           when 67 then ctrl(:f)
@@ -934,7 +894,13 @@ class FZF
       }
       actions = {
         :esc     => proc { exit 1 },
-        ctrl(:d) => proc { exit 1 if input.empty? },
+        ctrl(:d) => proc {
+          if input.empty?
+            exit 1
+          elsif cursor < input.length
+            input = input[0...cursor] + input[(cursor + 1)..-1]
+          end
+        },
         ctrl(:m) => proc {
           got = pick
           exit 0
@@ -946,8 +912,8 @@ class FZF
         },
         ctrl(:a) => proc { cursor = 0; nil },
         ctrl(:e) => proc { cursor = input.length; nil },
-        ctrl(:j) => proc { vselect { |v| v - 1 } },
+        ctrl(:j) => proc { vselect { |v| v - (@reverse ? -1 : 1) } },
-        ctrl(:k) => proc { vselect { |v| v + 1 } },
+        ctrl(:k) => proc { vselect { |v| v + (@reverse ? -1 : 1) } },
         ctrl(:w) => proc {
           pcursor = cursor
           backword.call
@@ -967,7 +933,7 @@ class FZF
                               when :stab then 1
                               when :sclick then 0
                               else -1
-                              end }
+                              end * (@reverse ? -1 : 1) }
           end
         },
         ctrl(:b) => proc { cursor = [0, cursor - 1].max; nil },
@@ -991,6 +957,7 @@ class FZF
             case event
             when :click, :release
               x, y, shift = val.values_at :x, :y, :shift
+              y = @reverse ? (C.lines - 1 - y) : y
               if y == cursor_y
                 cursor = [0, [input.length, x - 2].min].max
               elsif x > 1 && y <= max_items
@@ -1021,7 +988,6 @@ class FZF
       actions[127]      = actions[ctrl(:h)]
       actions[ctrl(:q)] = actions[ctrl(:g)] = actions[ctrl(:c)] = actions[:esc]
 
-      emit(:key) { [@query.get, cursor] } unless @query.empty?
       while true
         @cursor_x.set cursor
         render { print_input }
@@ -1059,7 +1025,7 @@ class FZF
     end
 
     def initialize nth, delim
-      @nth = nth && (nth > 0 ? nth - 1 : nth)
+      @nth = nth
       @delim = delim
       @tokens_cache = {}
     end
@@ -1080,11 +1046,15 @@ class FZF
       if @nth
         prefix_length, tokens = tokenize str
 
-        if (token = tokens[@nth]) && (md = token.match(pat) rescue nil)
+        @nth.each do |n|
-          prefix_length += (tokens[0...@nth] || []).join.length
+          if (range = tokens[n]) && (token = range.join) &&
+                (md = token.sub(/\s+$/, '').match(pat) rescue nil)
+            prefix_length += (tokens[0...(n.begin)] || []).join.length
             offset = md.offset(0).map { |o| o + prefix_length }
-          MatchData.new offset
+            return MatchData.new(offset)
           end
+        end
+        nil
       else
         str.match(pat) rescue nil
       end
@@ -1112,7 +1082,7 @@ class FZF
     def fuzzy_regex q
       @regexp[q] ||= begin
         q = q.downcase if @rxflag == Regexp::IGNORECASE
-        Regexp.new(query_chars(q).inject('') { |sum, e|
+        Regexp.new(q.split(//).inject('') { |sum, e|
           e = Regexp.escape e
           sum << (e.length > 1 ? "(?:#{e}).*?" :  # FIXME: not equivalent
                                  "#{e}[^#{e}]*?")
@@ -1170,7 +1140,7 @@ class FZF
             when ''
               nil
             when /^\^(.*)\$$/
-              Regexp.new('^' << sanitize(Regexp.escape($1)) << '$', rxflag_for(w))
+              Regexp.new('^' << Regexp.escape($1) << '$', rxflag_for(w))
             when /^'/
               if @mode == :fuzzy && w.length > 1
                 exact_regex w[1..-1]
@@ -1179,10 +1149,10 @@ class FZF
               end
             when /^\^/
               w.length > 1 ?
-                Regexp.new('^' << sanitize(Regexp.escape(w[1..-1])), rxflag_for(w)) : nil
+                Regexp.new('^' << Regexp.escape(w[1..-1]), rxflag_for(w)) : nil
             when /\$$/
               w.length > 1 ?
-                Regexp.new(sanitize(Regexp.escape(w[0..-2])) << '$', rxflag_for(w)) : nil
+                Regexp.new(Regexp.escape(w[0..-2]) << '$', rxflag_for(w)) : nil
             else
               @mode == :fuzzy ? fuzzy_regex(w) : exact_regex(w)
             end, invert ]
@@ -1190,7 +1160,7 @@ class FZF
     end
 
     def exact_regex w
-      Regexp.new(sanitize(Regexp.escape(w)), rxflag_for(w))
+      Regexp.new(Regexp.escape(w), rxflag_for(w))
     end
 
     def match list, q, prefix, suffix

fzf.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'fzf'
-  spec.version       = '0.8.2'
+  spec.version       = '0.8.4'
   spec.authors       = ['Junegunn Choi']
   spec.email         = ['junegunn.c@gmail.com']
   spec.description   = %q{Fuzzy finder for your shell}

install

@@ -12,10 +12,9 @@ if [ $? -ne 0 ]; then
 fi
 
 # System ruby is preferred
-curses_check="begin; require 'curses'; rescue Exception; exit 1; end"
 system_ruby=/usr/bin/ruby
 if [ -x $system_ruby -a $system_ruby != "$ruby" ]; then
-  $system_ruby --disable-gems -e "$curses_check" 2> /dev/null
+  $system_ruby --disable-gems -rcurses -e0 2> /dev/null
   [ $? -eq 0 ] && ruby=$system_ruby
 fi
 
@@ -23,7 +22,7 @@ echo "OK ($ruby)"
 
 # Curses-support
 echo -n "Checking Curses support ... "
-"$ruby" -e "$curses_check"
+"$ruby" -rcurses -e0 2> /dev/null
 if [ $? -eq 0 ]; then
   echo "OK"
 else
@@ -45,7 +44,7 @@ echo -n "Checking Ruby version ... "
 "$ruby" -e 'exit RUBY_VERSION >= "1.9"'
 if [ $? -eq 0 ]; then
   echo ">= 1.9"
-  "$ruby" --disable-gems -e "$curses_check"
+  "$ruby" --disable-gems -rcurses -e0 2> /dev/null
   if [ $? -eq 0 ]; then
     fzf_cmd="$ruby --disable-gems $fzf_base/fzf"
   else
@@ -73,7 +72,7 @@ for shell in bash zsh; do
   echo -n "Generate ~/.fzf.$shell ... "
   src=~/.fzf.${shell}
 
-  fzf_completion="source $fzf_base/fzf-completion.${shell}"
+  fzf_completion="[[ \$- =~ i ]] && source $fzf_base/fzf-completion.${shell}"
   if [ $auto_completion -ne 0 ]; then
     fzf_completion="# $fzf_completion"
   fi
@@ -98,9 +97,7 @@ EOF
       cat >> $src << "EOFZF"
 # Key bindings
 # ------------
-if [[ $- =~ i ]]; then
+__fsel() {
-
-read -r -d '' __fsel <<'EOF'
   find * -path '*/\.*' -prune \
     -o -type f -print \
     -o -type d -print \
@@ -108,21 +105,19 @@ read -r -d '' __fsel <<'EOF'
     printf '%q ' "$item"
   done
   echo
-EOF
-
-__fsel() {
-  eval "$__fsel"
 }
 
+if [[ $- =~ i ]]; then
+
 __fsel_tmux() {
-  local height lines
+  local height
   height=${FZF_TMUX_HEIGHT:-40%}
-  lines=${LINES:-40}
   if [[ $height =~ %$ ]]; then
-    height=${height:0:${#height}-1}
+    height="-p ${height%\%}"
-    height=$(( height * lines / 100 ))
+  else
+    height="-l $height"
   fi
-  tmux split-window -l $height "tmux send-keys -t $TMUX_PANE \"\$($__fsel)\""
+  tmux split-window $height "bash -c 'source ~/.fzf.bash; tmux send-keys -t $TMUX_PANE \"\$(__fsel)\"'"
 }
 
 __fcd() {
@@ -141,11 +136,11 @@ if [ -z "$(set -o | grep '^vi.*on')" ]; then
   if [ $__use_tmux -eq 1 ]; then
     bind '"\C-t": " \C-u \C-a\C-k$(__fsel_tmux)\e\C-e\C-y\C-a\C-d\C-y\ey\C-h"'
   else
-    bind '"\C-t": " \C-u \C-a\C-k$(__fsel)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er"'
+    bind '"\C-t": " \C-u \C-a\C-k$(__fsel)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"'
   fi
 
   # CTRL-R - Paste the selected command from history into the command line
-  bind '"\C-r": " \C-e\C-u$(HISTTIMEFORMAT= history | fzf +s | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
+  bind '"\C-r": " \C-e\C-u$(HISTTIMEFORMAT= history | fzf +s +m -n..,1,2.. | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
 
   # ALT-C - cd into the selected directory
   bind '"\ec": " \C-e\C-u$(__fcd)\e\C-e\er\C-m"'
@@ -158,11 +153,11 @@ else
   if [ $__use_tmux -eq 1 ]; then
     bind '"\C-t": "\e$a \eddi$(__fsel_tmux)\C-x\C-e\e0P$xa"'
   else
-    bind '"\C-t": "\e$a \eddi$(__fsel)\C-x\C-e\e0Px$a \C-x\C-r"'
+    bind '"\C-t": "\e$a \eddi$(__fsel)\C-x\C-e\e0Px$a \C-x\C-r\exa "'
   fi
 
   # CTRL-R - Paste the selected command from history into the command line
-  bind '"\C-r": "\eddi$(HISTTIMEFORMAT= history | fzf +s | sed \"s/ *[0-9]* *//\")\C-x\C-e\e$a\C-x\C-r"'
+  bind '"\C-r": "\eddi$(HISTTIMEFORMAT= history | fzf +s +m -n..,1,2.. | sed \"s/ *[0-9]* *//\")\C-x\C-e\e$a\C-x\C-r"'
 
   # ALT-C - cd into the selected directory
   bind '"\ec": "\eddi$(__fcd)\C-x\C-e\C-x\C-r\C-m"'
@@ -177,7 +172,8 @@ EOFZF
 # Key bindings
 # ------------
 # CTRL-T - Paste the selected file path(s) into the command line
-read -r -d '' __fsel <<'EOF'
+__fsel() {
+  set -o nonomatch
   find * -path '*/\.*' -prune \
     -o -type f -print \
     -o -type d -print \
@@ -185,22 +181,24 @@ read -r -d '' __fsel <<'EOF'
     printf '%q ' "$item"
   done
   echo
-EOF
+}
+
+if [[ $- =~ i ]]; then
 
 if [ -n "$TMUX_PANE" -a ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ]; then
   fzf-file-widget() {
-    local height lines
+    local height
     height=${FZF_TMUX_HEIGHT:-40%}
-    lines=${LINES:-40}
     if [[ $height =~ %$ ]]; then
-      height=${height:0:${#height}-1}
+      height="-p ${height%\%}"
-      height=$(( height * lines / 100 ))
+    else
+      height="-l $height"
     fi
-    tmux split-window -l $height "tmux send-keys -t $TMUX_PANE \"\$($__fsel)\""
+    tmux split-window $height "zsh -c 'source ~/.fzf.zsh; tmux send-keys -t $TMUX_PANE \"\$(__fsel)\"'"
   }
 else
   fzf-file-widget() {
-    LBUFFER="${LBUFFER%% #}$(eval "$__fsel")"
+    LBUFFER="${LBUFFER}$(__fsel)"
     zle redisplay
   }
 fi
@@ -209,7 +207,7 @@ bindkey '^T' fzf-file-widget
 
 # ALT-C - cd into the selected directory
 fzf-cd-widget() {
-  cd "${$(find * -path '*/\.*' -prune \
+  cd "${$(set -o nonomatch; find * -path '*/\.*' -prune \
           -o -type d -print 2> /dev/null | fzf):-.}"
   zle reset-prompt
 }
@@ -218,12 +216,13 @@ bindkey '\ec' fzf-cd-widget
 
 # CTRL-R - Paste the selected command from history into the command line
 fzf-history-widget() {
-  LBUFFER=$(fc -l 1 | fzf +s | sed "s/ *[0-9]* *//")
+  LBUFFER=$(fc -l 1 | fzf +s +m -n..,1,2.. | sed "s/ *[0-9*]* *//")
   zle redisplay
 }
 zle     -N   fzf-history-widget
 bindkey '^R' fzf-history-widget
 
+fi
 EOFZF
     fi
   fi
@@ -231,29 +230,122 @@ EOFZF
   echo "OK"
 done
 
-echo
+# fish
-for shell in bash zsh; do
+has_fish=0
-  rc=~/.${shell}rc
+if [ -n "$(which fish)" ]; then
-  src="source ~/.fzf.${shell}"
+  has_fish=1
+  echo -n "Generate ~/.config/fish/functions/fzf.fish ... "
+  mkdir -p ~/.config/fish/functions
+  cat > ~/.config/fish/functions/fzf.fish << EOFZF
+function fzf
+  $fzf_cmd \$argv
+end
+EOFZF
+  echo "OK"
 
-  echo "Update $rc:"
+  if [ $key_bindings -eq 0 ]; then
-  echo "  - $src"
+    echo -n "Generate ~/.config/fish/functions/fzf_key_bindings.fish ... "
-  line=$(grep -nF "$src" $rc | sed 's/:.*//')
+    cat > ~/.config/fish/functions/fzf_key_bindings.fish << "EOFZF"
+function fzf_key_bindings
+  function __fzf_select
+    find * -path '*/\.*' -prune \
+      -o -type f -print \
+      -o -type d -print \
+      -o -type l -print 2> /dev/null | fzf -m | while read item
+      echo -n (echo -n "$item" | sed 's/ /\\\\ /g')' '
+    end
+    echo
+  end
+
+  function __fzf_ctrl_t
+    if [ -n "$TMUX_PANE" -a "$FZF_TMUX" != "0" ]
+      tmux split-window (__fzf_tmux_height) "fish -c 'fzf_key_bindings; __fzf_ctrl_t_tmux \\$TMUX_PANE'"
+    else
+      __fzf_select > $TMPDIR/fzf.result
+      and commandline -i (cat $TMPDIR/fzf.result)
+      rm -f $TMPDIR/fzf.result
+    end
+  end
+
+  function __fzf_ctrl_t_tmux
+    __fzf_select > $TMPDIR/fzf.result
+    and tmux send-keys -t $argv[1] (cat $TMPDIR/fzf.result)
+    rm -f $TMPDIR/fzf.result
+  end
+
+  function __fzf_ctrl_r
+    if history | fzf +s +m > $TMPDIR/fzf.result
+      commandline (cat $TMPDIR/fzf.result)
+    else
+      commandline -f repaint
+    end
+    rm -f $TMPDIR/fzf.result
+  end
+
+  function __fzf_alt_c
+    find * -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf +m > $TMPDIR/fzf.result
+    if [ (cat $TMPDIR/fzf.result | wc -l) -gt 0 ]
+      cd (cat $TMPDIR/fzf.result)
+    end
+    commandline -f repaint
+    rm -f $TMPDIR/fzf.result
+  end
+
+  function __fzf_tmux_height
+    if set -q FZF_TMUX_HEIGHT
+      set height $FZF_TMUX_HEIGHT
+    else
+      set height 40%
+    end
+    if echo $height | grep -q -E '%$'
+      echo "-p "(echo $height | sed 's/%$//')
+    else
+      echo "-l $height"
+    end
+    set -e height
+  end
+
+  bind \ct '__fzf_ctrl_t'
+  bind \cr '__fzf_ctrl_r'
+  bind \ec '__fzf_alt_c'
+end
+EOFZF
+    echo "OK"
+  fi
+fi
+
+append_line() {
+  echo "Update $2:"
+  echo "  - $1"
+  [ -f "$2" ] || touch "$2"
+  line=$(grep -nF "$1" "$2" | sed 's/:.*//')
   if [ -n "$line" ]; then
     echo "    - Already exists (line #$line)"
   else
-    echo $src >> $rc
+    echo "$1" >> "$2"
     echo "    - Added"
   fi
   echo
+}
+
+echo
+for shell in bash zsh; do
+  append_line "source ~/.fzf.${shell}" ~/.${shell}rc
 done
 
+if [ $key_bindings -eq 0 -a $has_fish -eq 1 ]; then
+  bind_file=~/.config/fish/functions/fish_user_key_bindings.fish
+  append_line "fzf_key_bindings" "$bind_file"
+fi
+
 cat << EOF
-Finished. Reload your .bashrc or .zshrc.
+Finished. Restart your shell or reload config file.
    source ~/.bashrc  # bash
    source ~/.zshrc   # zsh
+EOF
+[ $has_fish -eq 1 ] && echo "   fzf_key_bindings  # fish"; cat << EOF
 
-To uninstall fzf, simply remove the added line.
+Use uninstall script to remove fzf.
 
 For more information, see: https://github.com/junegunn/fzf
 EOF

plugin/fzf.vim

@@ -21,8 +21,10 @@
 " OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 " WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+let s:min_tmux_width  = 10
 let s:min_tmux_height = 3
 let s:default_tmux_height = '40%'
+let s:launcher = 'xterm -e bash -ic %s'
 
 let s:cpo_save = &cpo
 set cpo&vim
@@ -40,6 +42,23 @@ else
   let s:exec = 'fzf'
 endif
 
+function! s:tmux_enabled()
+  if has('gui_running')
+    return 0
+  endif
+
+  if exists('s:tmux')
+    return s:tmux
+  endif
+
+  let s:tmux = 0
+  if exists('$TMUX')
+    let output = system('tmux -V')
+    let s:tmux = !v:shell_error && output >= 'tmux 1.7'
+  endif
+  return s:tmux
+endfunction
+
 function! s:shellesc(arg)
   return '"'.substitute(a:arg, '"', '\\"', 'g').'"'
 endfunction
@@ -49,11 +68,6 @@ function! s:escape(path)
 endfunction
 
 function! fzf#run(...) abort
-  if has('gui_running')
-    echohl Error
-    echo 'GVim is not supported'
-    return []
-  endif
   let dict   = exists('a:1') ? a:1 : {}
   let temps  = { 'result': tempname() }
   let optstr = get(dict, 'options', '')
@@ -75,14 +89,19 @@ function! fzf#run(...) abort
   endif
   let command = prefix.s:exec.' '.optstr.' > '.temps.result
 
-  if exists('$TMUX') && has_key(dict, 'tmux') &&
+  if s:tmux_enabled() && s:tmux_splittable(dict)
-        \ dict.tmux > 0 && winheight(0) >= s:min_tmux_height
     return s:execute_tmux(dict, command, temps)
   else
     return s:execute(dict, command, temps)
   endif
 endfunction
 
+function! s:tmux_splittable(dict)
+  return
+  \ min([&columns, get(a:dict, 'tmux_width', 0)]) >= s:min_tmux_width ||
+  \ min([&lines, get(a:dict, 'tmux_height', get(a:dict, 'tmux', 0))]) >= s:min_tmux_height
+endfunction
+
 function! s:pushd(dict)
   if has_key(a:dict, 'dir')
     let a:dict.prev_dir = getcwd()
@@ -99,9 +118,17 @@ endfunction
 function! s:execute(dict, command, temps)
   call s:pushd(a:dict)
   silent !clear
-  execute 'silent !'.a:command
+  if has('gui_running')
+    let launcher = get(a:dict, 'launcher', get(g:, 'fzf_launcher', s:launcher))
+    let command = printf(launcher, "'".substitute(a:command, "'", "'\"'\"'", 'g')."'")
+  else
+    let command = a:command
+  endif
+  execute 'silent !'.command
   redraw!
   if v:shell_error
+    echohl Error
+    echo 'Error running ' . command
     return []
   else
     return s:callback(a:dict, a:temps, 0)
@@ -115,21 +142,25 @@ function! s:execute_tmux(dict, command, temps)
     let command = a:command
   endif
 
-  if type(a:dict.tmux) == 1
+  let splitopt = '-v'
-    if a:dict.tmux =~ '%$'
+  if has_key(a:dict, 'tmux_width')
-      let height = screenrow() * str2nr(a:dict.tmux[0:-2]) / 100
+    let splitopt = '-h'
+    let size = a:dict.tmux_width
   else
-      let height = str2nr(a:dict.tmux)
+    let size = get(a:dict, 'tmux_height', get(a:dict, 'tmux'))
   endif
+
+  if type(size) == 1 && size =~ '%$'
+    let sizeopt = '-p '.size[0:-2]
   else
-    let height = a:dict.tmux
+    let sizeopt = '-l '.size
   endif
 
   let s:pane = substitute(
     \ system(
       \ printf(
-        \ 'tmux split-window -l %d -P -F "#{pane_id}" %s',
+        \ 'tmux split-window %s %s -P -F "#{pane_id}" %s',
-        \ height, s:shellesc(command))), '\n', '', 'g')
+        \ splitopt, sizeopt, s:shellesc(command))), '\n', '', 'g')
   let s:dict = a:dict
   let s:temps = a:temps
 

test/test_fzf.rb

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+require 'curses'
+require 'timeout'
+require 'stringio'
 require 'minitest/autorun'
 $LOAD_PATH.unshift File.expand_path('../..', __FILE__)
 ENV['FZF_EXECUTABLE'] = '0'
@@ -20,6 +23,16 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal true,  fzf.color
     assert_equal nil,   fzf.rxflag
     assert_equal true,  fzf.mouse
+    assert_equal nil,   fzf.nth
+    assert_equal true,  fzf.color
+    assert_equal false, fzf.black
+    assert_equal true,  fzf.ansi256
+    assert_equal '',    fzf.query.get
+    assert_equal false, fzf.select1
+    assert_equal false, fzf.exit0
+    assert_equal nil,   fzf.filter
+    assert_equal nil,   fzf.extended
+    assert_equal false, fzf.reverse
   end
 
   def test_environment_variables
@@ -30,7 +43,8 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal nil,   fzf.nth
 
     ENV['FZF_DEFAULT_OPTS'] =
-      '-x -m -s 10000 -q "  hello  world  " +c +2 --no-mouse -f "goodbye world" --black --nth=3'
+      '-x -m -s 10000 -q "  hello  world  " +c +2 --select-1 -0 ' +
+      '--no-mouse -f "goodbye world" --black --nth=3,-1,2 --reverse'
     fzf = FZF.new []
     assert_equal 10000,   fzf.sort
     assert_equal '  hello  world  ',
@@ -43,13 +57,17 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal false,   fzf.ansi256
     assert_equal true,    fzf.black
     assert_equal false,   fzf.mouse
-    assert_equal 3,       fzf.nth
+    assert_equal true,    fzf.select1
+    assert_equal true,    fzf.exit0
+    assert_equal true,    fzf.reverse
+    assert_equal [2..2, -1..-1, 1..1], fzf.nth
   end
 
   def test_option_parser
     # Long opts
-    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello
+    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello --select-1
-                     --filter=howdy --extended-exact --no-mouse --no-256 --nth=1]
+                     --exit-0 --filter=howdy --extended-exact
+                     --no-mouse --no-256 --nth=1 --reverse]
     assert_equal 2000,    fzf.sort
     assert_equal true,    fzf.multi
     assert_equal false,   fzf.color
@@ -58,13 +76,19 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal false,   fzf.mouse
     assert_equal 0,       fzf.rxflag
     assert_equal 'hello', fzf.query.get
+    assert_equal true,    fzf.select1
+    assert_equal true,    fzf.exit0
     assert_equal 'howdy', fzf.filter
     assert_equal :exact,  fzf.extended
-    assert_equal 1,       fzf.nth
+    assert_equal [0..0],  fzf.nth
+    assert_equal true,    fzf.reverse
 
-    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello
+    # Long opts (left-to-right)
-                     --filter a --filter b --no-256 --black --nth 2
+    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query=hello
-                     --no-sort -i --color --no-multi --256]
+                     --filter a --filter b --no-256 --black --nth -1 --nth -2
+                     --select-1 --exit-0 --no-select-1 --no-exit-0
+                     --no-sort -i --color --no-multi --256
+                     --reverse --no-reverse]
     assert_equal nil,     fzf.sort
     assert_equal false,   fzf.multi
     assert_equal true,    fzf.color
@@ -74,11 +98,14 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal 1,       fzf.rxflag
     assert_equal 'b',     fzf.filter
     assert_equal 'hello', fzf.query.get
+    assert_equal false,   fzf.select1
+    assert_equal false,   fzf.exit0
     assert_equal nil,     fzf.extended
-    assert_equal 2,       fzf.nth
+    assert_equal [-2..-2], fzf.nth
+    assert_equal false,   fzf.reverse
 
     # Short opts
-    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x -fhowdy +2 -n3]
+    fzf = FZF.new %w[-s2000 +c -m +i -qhello -x -fhowdy +2 -n3 -1 -0]
     assert_equal 2000,    fzf.sort
     assert_equal true,    fzf.multi
     assert_equal false,   fzf.color
@@ -87,11 +114,15 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal 'hello', fzf.query.get
     assert_equal 'howdy', fzf.filter
     assert_equal :fuzzy,  fzf.extended
-    assert_equal 3,       fzf.nth
+    assert_equal [2..2],  fzf.nth
+    assert_equal true,    fzf.select1
+    assert_equal true,    fzf.exit0
 
     # Left-to-right
-    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x -fgoodbye +2 -n3 -n4
+    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x -fgoodbye +2 -n3 -n4,5
-                     -s 3000 -c +m -i -q world +x -fworld -2 --black --no-black]
+                     -s 3000 -c +m -i -q world +x -fworld -2 --black --no-black
+                     -1 -0 +1 +0
+                    ]
     assert_equal 3000,    fzf.sort
     assert_equal false,   fzf.multi
     assert_equal true,    fzf.color
@@ -99,29 +130,32 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal false,   fzf.black
     assert_equal 1,       fzf.rxflag
     assert_equal 'world', fzf.query.get
+    assert_equal false,   fzf.select1
+    assert_equal false,   fzf.exit0
     assert_equal 'world', fzf.filter
     assert_equal nil,     fzf.extended
-    assert_equal 4,       fzf.nth
+    assert_equal [3..3, 4..4], fzf.nth
-
-    fzf = FZF.new %w[--query hello +s -s 2000 --query=world]
-    assert_equal 2000,    fzf.sort
-    assert_equal 'world', fzf.query.get
   rescue SystemExit => e
     assert false, "Exited"
   end
 
   def test_invalid_option
-    [%w[--unknown], %w[yo dawg]].each do |argv|
+    [
+      %w[--unknown],
+      %w[yo dawg],
+      %w[--nth=0],
+      %w[-n 0],
+      %w[-n 1..2..3],
+      %w[-n 1....],
+      %w[-n ....3],
+      %w[-n 1....3],
+      %w[-n 1..0],
+      %w[--nth ..0],
+    ].each do |argv|
       assert_raises(SystemExit) do
         fzf = FZF.new argv
       end
     end
-    assert_raises(SystemExit) do
-      fzf = FZF.new %w[--nth=0]
-    end
-    assert_raises(SystemExit) do
-      fzf = FZF.new %w[-n 0]
-    end
   end
 
   # FIXME Only on 1.9 or above
@@ -376,7 +410,7 @@ class TestFZF < MiniTest::Unit::TestCase
        ["0____1",   [[0, 6]]],
        ["0_____1",  [[0, 7]]],
        ["0______1", [[0, 8]]]],
-      FZF.new([]).sort_by_rank(matcher.match(list, '01', '', '')))
+      FZF.sort(matcher.match(list, '01', '', '')))
 
     assert_equal(
       [["01",       [[0, 1], [1, 2]]],
@@ -387,16 +421,19 @@ class TestFZF < MiniTest::Unit::TestCase
        ["____0_1",  [[4, 5], [6, 7]]],
        ["0______1", [[0, 1], [7, 8]]],
        ["___01___", [[3, 4], [4, 5]]]],
-      FZF.new([]).sort_by_rank(xmatcher.match(list, '0 1', '', '')))
+      FZF.sort(xmatcher.match(list, '0 1', '', '')))
 
     assert_equal(
-      [["_01_",     [[1, 3], [0, 4]]],
+      [["_01_",     [[1, 3], [0, 4]], [4, 4, "_01_"]],
-       ["0____1",   [[0, 6], [1, 3]]],
+       ["___01___", [[3, 5], [0, 2]], [4, 8, "___01___"]],
-       ["0_____1",  [[0, 7], [1, 3]]],
+       ["____0_1",  [[4, 7], [0, 2]], [5, 7, "____0_1"]],
-       ["0______1", [[0, 8], [1, 3]]],
+       ["0____1",   [[0, 6], [1, 3]], [6, 6, "0____1"]],
-       ["___01___", [[3, 5], [0, 2]]],
+       ["0_____1",  [[0, 7], [1, 3]], [7, 7, "0_____1"]],
-       ["____0_1",  [[4, 7], [0, 2]]]],
+       ["0______1", [[0, 8], [1, 3]], [8, 8, "0______1"]]],
-      FZF.new([]).sort_by_rank(xmatcher.match(list, '01 __', '', '')))
+      FZF.sort(xmatcher.match(list, '01 __', '', '')).map { |tuple|
+        tuple << FZF.rank(tuple)
+      }
+    )
   end
 
   def test_extended_exact_mode
@@ -418,58 +455,11 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal 2, exact.match(list, "-fuzzy", '', '').length
   end
 
-  if RUBY_PLATFORM =~ /darwin/
-    NFD = '한글'
-    def test_nfc
-      assert_equal 6, NFD.length
-      assert_equal ["한글", [[0, 1], [1, 2]]],
-        FZF::UConv.nfc(NFD, [[0, 3], [3, 6]])
-
-      nfd2 = 'before' + NFD + 'after'
-      assert_equal 6 + 6 + 5, nfd2.length
-
-      nfc, offsets = FZF::UConv.nfc(nfd2, [[4, 14], [9, 13]])
-      o1, o2 = offsets
-      assert_equal 'before한글after', nfc
-      assert_equal 're한글af',        nfc[(o1.first...o1.last)]
-      assert_equal '글a',             nfc[(o2.first...o2.last)]
-    end
-
-    def test_nfd
-      nfc = '한글'
-      nfd = FZF::UConv.nfd(nfc)
-      assert_equal 2, nfd.length
-      assert_equal 6, nfd.join.length
-      assert_equal NFD, nfd.join
-    end
-
-    def test_nfd_fuzzy_matcher
-      matcher = FZF::FuzzyMatcher.new 0
-      assert_equal [], matcher.match([NFD + NFD], '할', '', '')
-      match   = matcher.match([NFD + NFD], '글글', '', '')
-      assert_equal [[NFD + NFD, [[3, 12]]]], match
-      assert_equal ['한글한글', [[1, 4]]], FZF::UConv.nfc(*match.first)
-    end
-
-    def test_nfd_extended_fuzzy_matcher
-      matcher = FZF::ExtendedFuzzyMatcher.new 0
-      assert_equal [], matcher.match([NFD], "'글글", '', '')
-      match   = matcher.match([NFD], "'한글", '', '')
-      assert_equal [[NFD, [[0, 6]]]], match
-      assert_equal ['한글', [[0, 2]]], FZF::UConv.nfc(*match.first)
-    end
-  end
-
-  def test_split
-    assert_equal ["a", "b", "c", "\xFF", "d", "e", "f"],
-      FZF::UConv.split("abc\xFFdef")
-  end
-
   # ^$ -> matches empty item
   def test_format_empty_item
     fzf = FZF.new []
     item = ['', [[0, 0]]]
-    line, offsets = fzf.convert_item item
+    line, offsets = item
     tokens        = fzf.format line, 80, offsets
     assert_equal [], tokens
   end
@@ -502,33 +492,161 @@ class TestFZF < MiniTest::Unit::TestCase
       [list[0], [[2,  5]]],
       [list[1], [[9, 17]]]], matcher.match(list, 'is', '', '')
 
-    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 2
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [1..1]
     assert_equal [[list[1], [[8, 9]]]], matcher.match(list, 'f', '', '')
     assert_equal [[list[0], [[8, 9]]]], matcher.match(list, 's', '', '')
 
-    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 3
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [2..2]
     assert_equal [[list[0], [[19, 20]]]], matcher.match(list, 'r', '', '')
 
+    # Comma-separated
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [2..2, 0..0]
+    assert_equal [[list[0], [[19, 20]]], [list[1], [[3, 4]]]], matcher.match(list, 'r', '', '')
+
+    # Ordered
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [0..0, 2..2]
+    assert_equal [[list[0], [[3, 4]]], [list[1], [[3, 4]]]], matcher.match(list, 'r', '', '')
+
     regex = FZF.build_delim_regex "\t"
-    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 1, regex
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [0..0], regex
     assert_equal [[list[0], [[3, 10]]]], matcher.match(list, 're', '', '')
 
-    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 2, regex
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [1..1], regex
     assert_equal [], matcher.match(list, 'r', '', '')
     assert_equal [[list[1], [[9, 17]]]], matcher.match(list, 'is', '', '')
 
     # Negative indexing
-    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, -1, regex
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [-1..-1], regex
     assert_equal [[list[0], [[3, 6]]]], matcher.match(list, 'rt', '', '')
     assert_equal [[list[0], [[2, 5]]], [list[1], [[9, 17]]]], matcher.match(list, 'is', '', '')
 
     # Regex delimiter
     regex = FZF.build_delim_regex "[ \t]+"
-    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 1, regex
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [0..0], regex
     assert_equal [list[1]], matcher.match(list, 'f', '', '').map(&:first)
 
-    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 2, regex
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [1..1], regex
     assert_equal [[list[0], [[1, 2]]], [list[1], [[8, 9]]]], matcher.match(list, 'f', '', '')
   end
+
+  def test_nth_match_range
+    list = [
+      ' first  second  third',
+      'fourth	 fifth   sixth',
+    ]
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [1..2]
+    assert_equal [[list[0], [[8, 20]]]], matcher.match(list, 'sr', '', '')
+    assert_equal [], matcher.match(list, 'fo', '', '')
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [1..-1, 0..0]
+    assert_equal [[list[0], [[8, 20]]]], matcher.match(list, 'sr', '', '')
+    assert_equal [[list[1], [[0, 2]]]], matcher.match(list, 'fo', '', '')
+
+    matcher = FZF::ExtendedFuzzyMatcher.new Regexp::IGNORECASE, :fuzzy, [0..0, 1..2]
+    assert_equal [], matcher.match(list, '^t', '', '')
+
+    matcher = FZF::ExtendedFuzzyMatcher.new Regexp::IGNORECASE, :fuzzy, [0..1, 2..2]
+    assert_equal [[list[0], [[16, 17]]]], matcher.match(list, '^t', '', '')
+
+    matcher = FZF::ExtendedFuzzyMatcher.new Regexp::IGNORECASE, :fuzzy, [1..-1]
+    assert_equal [[list[0], [[8, 9]]]], matcher.match(list, '^s', '', '')
+  end
+
+  def stream_for str
+    StringIO.new(str).tap do |sio|
+      sio.instance_eval do
+        alias org_gets gets
+
+        def gets
+          org_gets.tap { |e| sleep 0.5 unless e.nil? }
+        end
+      end
+    end
+  end
+
+  def test_select_1
+    stream = stream_for "Hello\nWorld"
+    output = StringIO.new
+
+    begin
+      $stdout = output
+      FZF.new(%w[--query=ol --select-1], stream).start
+    rescue SystemExit => e
+      assert_equal 0, e.status
+      assert_equal 'World', output.string.chomp
+    ensure
+      $stdout = STDOUT
+    end
+  end
+
+  def test_select_1_without_query
+    stream = stream_for "Hello World"
+    output = StringIO.new
+
+    begin
+      $stdout = output
+      FZF.new(%w[--select-1], stream).start
+    rescue SystemExit => e
+      assert_equal 0, e.status
+      assert_equal 'Hello World', output.string.chomp
+    ensure
+      $stdout = STDOUT
+    end
+  end
+
+  def test_select_1_ambiguity
+    stream = stream_for "Hello\nWorld"
+    begin
+      Timeout::timeout(3) do
+        FZF.new(%w[--query=o --select-1], stream).start
+      end
+      flunk 'Should not reach here'
+    rescue Exception => e
+      Curses.close_screen
+      assert_instance_of Timeout::Error, e
+    end
+  end
+
+  def test_exit_0
+    stream = stream_for "Hello\nWorld"
+    output = StringIO.new
+
+    begin
+      $stdout = output
+      FZF.new(%w[--query=zz --exit-0], stream).start
+    rescue SystemExit => e
+      assert_equal 0, e.status
+      assert_equal '', output.string
+    ensure
+      $stdout = STDOUT
+    end
+  end
+
+  def test_exit_0_without_query
+    stream = stream_for ""
+    output = StringIO.new
+
+    begin
+      $stdout = output
+      FZF.new(%w[--exit-0], stream).start
+    rescue SystemExit => e
+      assert_equal 0, e.status
+      assert_equal '', output.string
+    ensure
+      $stdout = STDOUT
+    end
+  end
+
+  def test_ranking_overlap_match_regions
+    list = [
+      '1           3   4      2',
+      '1           2   3    4'
+    ]
+    assert_equal [
+      ['1           2   3    4',   [[0, 13], [16, 22]]],
+      ['1           3   4      2', [[0, 24], [12, 17]]],
+    ], FZF.sort(FZF::ExtendedFuzzyMatcher.new(nil).match(list, '12 34', '', ''))
+  end
 end
 

uninstall

@@ -0,0 +1,70 @@
+#!/bin/bash
+
+confirm() {
+  while [ 1 ]; do
+    read -p "$1" -n 1 -r
+    echo
+    if [[ "$REPLY" =~ ^[Yy] ]]; then
+      return 0
+    elif [[ "$REPLY" =~ ^[Nn] ]]; then
+      return 1
+    fi
+  done
+}
+
+remove() {
+  echo "Remove $1"
+  rm -f "$1"
+}
+
+remove_line() {
+  src=$(readlink "$2")
+  if [ $? -eq 0 ]; then
+    echo "Remove from $2 ($src):"
+  else
+    src=$2
+    echo "Remove from $2:"
+  fi
+
+  line_no=1
+  match=0
+  while [ 1 ]; do
+    line=$(sed -n "$line_no,\$p" "$src" | grep -m1 -nF "$1") || break
+    line_no=$(( $(sed 's/:.*//' <<< "$line") + line_no - 1 ))
+    content=$(sed 's/^[0-9]*://' <<< "$line")
+    match=1
+    echo    "  - Line #$line_no: $content"
+    [ "$content" = "$1" ] || confirm "    - Remove (y/n) ? "
+    if [ $? -eq 0 ]; then
+      awk -v n=$line_no 'NR == n {next} {print}' "$src" > "$src.bak" &&
+        mv "$src.bak" "$src" || break
+      echo  "      - Removed"
+    else
+      echo  "      - Skipped"
+      line_no=$(( line_no + 1 ))
+    fi
+  done
+  [ $match -eq 0 ] && echo "  - Nothing found"
+  echo
+}
+
+for shell in bash zsh; do
+  remove ~/.fzf.${shell}
+  remove_line "source ~/.fzf.${shell}" ~/.${shell}rc
+done
+
+bind_file=~/.config/fish/functions/fish_user_key_bindings.fish
+if [ -f "$bind_file" ]; then
+  remove_line "fzf_key_bindings" "$bind_file"
+fi
+
+if [ -d ~/.config/fish/functions ]; then
+  remove ~/.config/fish/functions/fzf.fish
+
+  if [ "$(ls -A ~/.config/fish/functions)" ]; then
+    echo "Can't delete non-empty directory: \"~/.config/fish/functions\""
+  else
+    rmdir ~/.config/fish/functions
+  fi
+fi
+