Update version

Remove `1` from --nth option. With the change you can no more use `$`
anchor to match the tail of a command index. But it makes search
around 15% faster.

    jg@jg:~> time cat history | fzf +s -n..,1,2.. -f fzf > /dev/nul
    real    0m2.929s
    user    0m2.766s
    sys     0m0.154s

    jg@jg:~> time cat history | fzf +s -n2..,.. -f fzf > /dev/null
    real    0m2.535s
    user    0m2.422s
    sys     0m0.112s

README.md

@@ -270,6 +270,14 @@ ssh **<TAB>
 telnet **<TAB>
 ```
 
+#### Environment variables / Aliases
+
+```sh
+unset **<TAB>
+export **<TAB>
+unalias **<TAB>
+```
+
 #### Settings
 
 ```sh

fzf

@@ -7,7 +7,7 @@
 #  / __/ / /_/ __/
 # /_/   /___/_/    Fuzzy finder for your shell
 #
-# Version: 0.8.6 (Jun 30, 2014)
+# Version: 0.8.7 (Aug 17, 2014)
 #
 # Author:  Junegunn Choi
 # URL:     https://github.com/junegunn/fzf
@@ -36,8 +36,13 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'thread'
+begin
   require 'curses'
+rescue LoadError
+  $stderr.puts 'curses gem is not installed. Try `gem install curses`.'
+  exit 1
+end
+require 'thread'
 require 'set'
 
 unless String.method_defined? :force_encoding
@@ -361,7 +366,8 @@ class FZF
     end if str
   end
   def addstr_safe str
-    C.addstr str.gsub("\0", '')
+    str = str.gsub("\0", '') rescue str
+    C.addstr str
   end
 
   def print_input
@@ -882,6 +888,8 @@ class FZF
             case read_nbs
             when [59, 50, 68] then ctrl(:a)
             when [59, 50, 67] then ctrl(:e)
+            when [59, 53, 68] then :alt_b
+            when [59, 53, 67] then :alt_f
             when [126]        then ctrl(:a)
             end
           when 52 then read_nb; ctrl(:e)
@@ -1095,26 +1103,32 @@ class FZF
 
     def tokenize str
       @tokens_cache[str] ||=
+        begin
           unless @delim
             # AWK default
-          prefix_length = str[/^\s+/].length rescue 0
+            prefix_length = (str.index(/\S/) || 0) rescue 0
-          [prefix_length, (str.strip.scan(/\S+\s*/) rescue [])]
+            tokens = str.scan(/\S+\s*/) rescue []
           else
             prefix_length = 0
-          [prefix_length, (str.scan(@delim) rescue [])]
+            tokens = str.scan(@delim) rescue []
+          end
+          @nth.map { |n|
+            if n.begin == 0 && n.end == -1
+              [prefix_length, tokens.join]
+            elsif part = tokens[n]
+              [prefix_length + (tokens[0...(n.begin)] || []).join.length,
+               part.join]
+            end
+          }.compact
         end
     end
 
     def do_match str, pat
       if @nth
-        prefix_length, tokens = tokenize str
+        tokenize(str).each do |pair|
-
+          prefix_length, token = pair
-        @nth.each do |n|
+          if md = token.match(pat) rescue nil
-          if (range = tokens[n]) && (token = range.join) &&
+            return MatchData.new(md.offset(0).map { |o| o + prefix_length })
-                (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 }
-            return MatchData.new(offset)
           end
         end
         nil

fzf-completion.bash

@@ -8,12 +8,35 @@
 # - $FZF_COMPLETION_TRIGGER (default: '**')
 # - $FZF_COMPLETION_OPTS    (default: empty)
 
+_fzf_orig_completion_filter() {
+  sed 's/.*-F *\([^ ]*\).* \([^ ]*\)$/export _fzf_orig_completion_\2=\1;/' |
+  sed 's/[^a-z0-9_= ;]/_/g'
+}
+
 _fzf_opts_completion() {
   local cur prev opts
   COMPREPLY=()
   cur="${COMP_WORDS[COMP_CWORD]}"
   prev="${COMP_WORDS[COMP_CWORD-1]}"
-  opts="-m --multi -x --extended -s --sort +s +i +c --no-color"
+  opts="
+    -x --extended
+    -e --extended-exact
+    -i +i
+    -n --nth
+    -d --delimiter
+    -s --sort +s
+    -m --multi
+    --no-mouse
+    +c --no-color
+    +2 --no-256
+    --black
+    --reverse
+    --prompt
+    -q --query
+    -1 --select-1
+    -0 --exit-0
+    -f --filter
+    --print-query"
 
   case "${prev}" in
   --sort|-s)
@@ -30,7 +53,7 @@ _fzf_opts_completion() {
   return 0
 }
 
-_fzf_generic_completion() {
+_fzf_path_completion() {
   local cur base dir leftover matches trigger cmd orig
   cmd=$(echo ${COMP_WORDS[0]} | sed 's/[^a-z0-9_=]/_/g')
   COMPREPLY=()
@@ -66,24 +89,57 @@ _fzf_generic_completion() {
     shift
     shift
     orig=$(eval "echo \$_fzf_orig_completion_$cmd")
-    [ -n "$orig" ] && type "$orig" > /dev/null && $orig "$@"
+    [ -n "$orig" ] && type "$orig" > /dev/null 2>&1 && $orig "$@"
+  fi
+}
+
+_fzf_list_completion() {
+  local cur selected trigger cmd src ret
+  read -r src
+  cmd=$(echo ${COMP_WORDS[0]} | sed 's/[^a-z0-9_=]/_/g')
+  trigger=${FZF_COMPLETION_TRIGGER:-**}
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  if [[ ${cur} == *"$trigger" ]]; then
+    cur=${cur:0:${#cur}-${#trigger}}
+
+    tput sc
+    selected=$(eval "$src | fzf $FZF_COMPLETION_OPTS $1 -q '$cur'" | tr '\n' ' ')
+    selected=${selected% }
+    tput rc
+
+    if [ -n "$selected" ]; then
+      COMPREPLY=("$selected")
+      return 0
+    fi
+  else
+    shift
+    orig=$(eval "echo \$_fzf_orig_completion_$cmd")
+    if [ -n "$orig" ] && type "$orig" > /dev/null; then
+      $orig "$@"
+    elif [ -n "$_fzf_completion_loader" ]; then
+      _completion_loader "$@"
+      ret=$?
+      eval $(complete | grep "\-F.* $cmd$" | _fzf_orig_completion_filter)
+      source $BASH_SOURCE
+      return $ret
+    fi
   fi
 }
 
 _fzf_all_completion() {
-  _fzf_generic_completion \
+  _fzf_path_completion \
     "-name .git -prune -o -name .svn -prune -o -type d -print -o -type f -print -o -type l -print" \
     "-m" "$@"
 }
 
 _fzf_file_completion() {
-  _fzf_generic_completion \
+  _fzf_path_completion \
     "-name .git -prune -o -name .svn -prune -o -type f -print -o -type l -print" \
     "-m" "$@"
 }
 
 _fzf_dir_completion() {
-  _fzf_generic_completion \
+  _fzf_path_completion \
     "-name .git -prune -o -name .svn -prune -o -type d -print" \
     "" "$@"
 }
@@ -103,40 +159,27 @@ _fzf_kill_completion() {
 }
 
 _fzf_telnet_completion() {
-  local cur selected trigger
+  _fzf_list_completion '+m' "$@" << "EOF"
-  trigger=${FZF_COMPLETION_TRIGGER:-**}
+  grep -v '^\s*\(#\|$\)' /etc/hosts | awk '{if (length($2) > 0) {print $2}}' | sort -u
-  cur="${COMP_WORDS[COMP_CWORD]}"
+EOF
-  [[ ${cur} == *"$trigger" ]] || return 1
-  cur=${cur:0:${#cur}-${#trigger}}
-
-  tput sc
-  selected=$(grep -v '^\s*\(#\|$\)' /etc/hosts | awk '{print $2}' | sort -u | fzf $FZF_COMPLETION_OPTS -q "$cur")
-  tput rc
-
-  if [ -n "$selected" ]; then
-    COMPREPLY=("$selected")
-    return 0
-  fi
 }
 
 _fzf_ssh_completion() {
-  local cur selected trigger
+  _fzf_list_completion '+m' "$@" << "EOF"
-  trigger=${FZF_COMPLETION_TRIGGER:-**}
+    cat <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | grep -i ^host | grep -v '*') <(grep -v '^\s*\(#\|$\)' /etc/hosts) | awk '{print $2}' | sort -u
-  cur="${COMP_WORDS[COMP_CWORD]}"
+EOF
-  [[ ${cur} == *"$trigger" ]] || return 1
+}
-  cur=${cur:0:${#cur}-${#trigger}}
 
-  tput sc
+_fzf_env_var_completion() {
-  selected=$(cat \
+  _fzf_list_completion '-m' "$@" << "EOF"
-    <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | grep -i ^host) \
+  declare -xp | sed 's/=.*//' | sed 's/.* //'
-    <(grep -v '^\s*\(#\|$\)' /etc/hosts) | \
+EOF
-    awk '{print $2}' | sort -u | fzf $FZF_COMPLETION_OPTS -q "$cur")
+}
-  tput rc
 
-  if [ -n "$selected" ]; then
+_fzf_alias_completion() {
-    COMPREPLY=("$selected")
+  _fzf_list_completion '-m' "$@" << "EOF"
-    return 0
+  alias | sed 's/=.*//' | sed 's/.* //'
-  fi
+EOF
 }
 
 # fzf options
@@ -153,15 +196,18 @@ a_cmds="
   find git grep gunzip gzip hg jar
   ln ls mv open rm rsync scp
   svn tar unzip zip"
+x_cmds="kill ssh telnet unset unalias export"
 
 # Preserve existing completion
-if [ "$_fzf_completion_loaded" != '0.8.6' ]; then
+if [ "$_fzf_completion_loaded" != '0.8.6-1' ]; then
   # Really wish I could use associative array but OSX comes with bash 3.2 :(
   eval $(complete | grep '\-F' | grep -v _fzf_ |
-    grep -E -w "$(echo $d_cmds $f_cmds $a_cmds | sed 's/ /|/g' | sed 's/+/\\+/g')" |
+    grep -E " ($(echo $d_cmds $f_cmds $a_cmds $x_cmds | sed 's/ /|/g' | sed 's/+/\\+/g'))$" | _fzf_orig_completion_filter)
-    sed -E 's/.*-F *([^ ]*).* ([^ ]*)$/export _fzf_orig_completion_\2=\1;/' |
+  export _fzf_completion_loaded=0.8.6-1
-    sed 's/[^a-z0-9_= ;]/_/g')
+fi
-  export _fzf_completion_loaded=0.8.6
+
+if type _completion_loader > /dev/null 2>&1; then
+  _fzf_completion_loader=1
 fi
 
 # Directory
@@ -186,4 +232,9 @@ complete -F _fzf_kill_completion -o nospace -o default -o bashdefault kill
 complete -F _fzf_ssh_completion -o default -o bashdefault ssh
 complete -F _fzf_telnet_completion -o default -o bashdefault telnet
 
-unset cmd d_cmds f_cmds a_cmds
+# Environment variables / Aliases
+complete -F _fzf_env_var_completion -o default -o bashdefault unset
+complete -F _fzf_env_var_completion -o default -o bashdefault export
+complete -F _fzf_alias_completion -o default -o bashdefault unalias
+
+unset cmd d_cmds f_cmds a_cmds x_cmds

install

@@ -28,7 +28,11 @@ if [ $? -eq 0 ]; then
 else
   echo "Not found"
   echo "Installing 'curses' gem ... "
-  /usr/bin/env gem install curses -v 1.0.0 --user-install
+  if (( EUID )); then
+    /usr/bin/env gem install curses --user-install
+  else
+    /usr/bin/env gem install curses
+  fi
   if [ $? -ne 0 ]; then
     echo
     echo "Failed to install 'curses' gem."
@@ -140,7 +144,7 @@ if [ -z "$(set -o | grep '^vi.*on')" ]; then
   fi
 
   # CTRL-R - Paste the selected command from history into the command line
-  bind '"\C-r": " \C-e\C-u$(HISTTIMEFORMAT= history | fzf +s +m -n..,1,2.. | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
+  bind '"\C-r": " \C-e\C-u$(HISTTIMEFORMAT= history | fzf +s +m -n2..,.. | 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,7 +162,7 @@ else
   bind -m vi-command '"\C-t": "i\C-t"'
 
   # CTRL-R - Paste the selected command from history into the command line
-  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"'
+  bind '"\C-r": "\eddi$(HISTTIMEFORMAT= history | fzf +s +m -n2..,.. | sed \"s/ *[0-9]* *//\")\C-x\C-e\e$a\C-x\C-r"'
   bind -m vi-command '"\C-r": "i\C-r"'
 
   # ALT-C - cd into the selected directory
@@ -219,7 +223,7 @@ 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 +m -n..,1,2.. | sed "s/ *[0-9*]* *//")
+  LBUFFER=$(fc -l 1 | fzf +s +m -n2..,.. | sed "s/ *[0-9*]* *//")
   zle redisplay
 }
 zle     -N   fzf-history-widget

plugin/fzf.vim

@@ -148,11 +148,18 @@ function! s:execute(dict, command, temps)
   endif
 endfunction
 
-function! s:execute_tmux(dict, command, temps)
+function! s:env_var(name)
-  if has_key(a:dict, 'dir')
+  if exists('$'.a:name)
-    let command = 'cd '.s:escape(a:dict.dir).' && '.a:command
+    return a:name . "='". substitute(expand('$'.a:name), "'", "'\\\\''", 'g') . "' "
   else
-    let command = a:command
+    return ''
+  endif
+endfunction
+
+function! s:execute_tmux(dict, command, temps)
+  let command = s:env_var('FZF_DEFAULT_OPTS').s:env_var('FZF_DEFAULT_COMMAND').a:command
+  if has_key(a:dict, 'dir')
+    let command = 'cd '.s:escape(a:dict.dir).' && '.command
   endif
 
   let splitopt = '-v'

test/test_fzf.rb

@@ -5,6 +5,7 @@ require 'curses'
 require 'timeout'
 require 'stringio'
 require 'minitest/autorun'
+require 'tempfile'
 $LOAD_PATH.unshift File.expand_path('../..', __FILE__)
 ENV['FZF_EXECUTABLE'] = '0'
 load 'fzf'
@@ -614,7 +615,7 @@ class TestFZF < MiniTest::Unit::TestCase
   def test_select_1_ambiguity
     stream = stream_for "Hello\nWorld"
     begin
-      Timeout::timeout(3) do
+      Timeout::timeout(2) do
         FZF.new(%w[--query=o --select-1], stream).start
       end
       flunk 'Should not reach here'
@@ -681,5 +682,19 @@ class TestFZF < MiniTest::Unit::TestCase
     # **[*****  #] => [******# ]
     assert_equal [true, 0, 6], fzf.constrain(2, 10, 7, 10)
   end
+
+  def test_invalid_utf8
+    tmp = Tempfile.new('fzf')
+    tmp << 'hello ' << [0xff].pack('C*') << ' world' << $/ << [0xff].pack('C*')
+    tmp.close
+    begin
+      Timeout::timeout(1) do
+        FZF.new(%w[-n..,1,2.. -q^ -x], File.open(tmp.path)).start
+      end
+    rescue Timeout::Error
+    end
+  ensure
+    tmp.unlink
+  end
 end