0.11.3

Use $SHELL to start $FZF_DEFAULT_COMMAND (#481 )
Fix #481 - Use $SHELL instead of sh in execute action
2025-11-14 06:13:47 -05:00 · 2016-02-07 11:00:10 +09:00 · 2016-02-07 01:49:29 +09:00 · 2016-02-03 04:46:02 +09:00 · 2016-02-02 17:51:21 +09:00 · 2016-01-29 01:31:04 +09:00
35 changed files with 1610 additions and 707 deletions
--- a/.gitmodules
+++ b/.gitmodules
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,65 @@
 CHANGELOG
 =========

+0.11.3
+------
+
+- Graceful exit on SIGTERM (#482)
+- `$SHELL` instead of `sh` for `execute` action and `$FZF_DEFAULT_COMMAND` (#481)
+- Changes in fuzzy completion API
+    - [`_fzf_compgen_{path,dir}`](https://github.com/junegunn/fzf/commit/9617647)
+    - [`_fzf_complete_COMMAND_post`](https://github.com/junegunn/fzf/commit/8206746)
+      for post-processing
+
+0.11.2
+------
+
+- `--tiebreak` now accepts comma-separated list of sort criteria
+    - Each criterion should appear only once in the list
+    - `index` is only allowed at the end of the list
+    - `index` is implicitly appended to the list when not specified
+    - Default is `length` (or equivalently `length,index`)
+- `begin` criterion will ignore leading whitespaces when calculating the index
+- Added `toggle-in` and `toggle-out` actions
+    - Switch direction depending on `--reverse`-ness
+    - `export FZF_DEFAULT_OPTS="--bind tab:toggle-out,shift-tab:toggle-in"`
+- Reduced the initial delay when `--tac` is not given
+    - fzf defers the initial rendering of the screen up to 100ms if the input
+      stream is ongoing to prevent unnecessary redraw during the initial
+      phase. However, 100ms delay is quite noticeable and might give the
+      impression that fzf is not snappy enough. This commit reduces the
+      maximum delay down to 20ms when `--tac` is not specified, in which case
+      the input list quickly fills the entire screen.
+
+0.11.1
+------
+
+- Added `--tabstop=SPACES` option
+
+0.11.0
+------
+
+- Added OR operator for extended-search mode
+- Added `--execute-multi` action
+- Fixed incorrect cursor position when unicode wide characters are used in
+  `--prompt`
+- Fixes and improvements in shell extensions
+
+0.10.9
+------
+
+- Extended-search mode is now enabled by default
+    - `--extended-exact` is deprecated and instead we have `--exact` for
+      orthogonally controlling "exactness" of search
+- Fixed not to display non-printable characters
+- Added `double-click` for `--bind` option
+- More robust handling of SIGWINCH
+
+0.10.8
+------
+
+- Fixed panic when trying to set colors after colors are disabled (#370)
+
 0.10.7
 ------

--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 Junegunn Choi
+Copyright (c) 2016 Junegunn Choi

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -50,10 +50,10 @@ git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
 On OS X, you can use [Homebrew](http://brew.sh/) to install fzf.

 ```sh
-brew reinstall --HEAD fzf
+brew install fzf

 # Install shell extensions
-/usr/local/Cellar/fzf/HEAD/install
+/usr/local/opt/fzf/install
 ```

 #### Install as Vim plugin
@@ -68,7 +68,7 @@ Or you can have [vim-plug](https://github.com/junegunn/vim-plug) manage fzf
 (recommended):

 ```vim
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 ```

 #### Upgrading fzf
@@ -78,7 +78,7 @@ while. Please follow the instruction below depending on the installation
 method.

 - git: `cd ~/.fzf && git pull && ./install`
- brew: `brew reinstall --HEAD fzf`
+- brew: `brew update; brew reinstall fzf`
 - vim-plug: `:PlugUpdate fzf`

 Usage
@@ -108,32 +108,41 @@ vim $(fzf)
 - Mouse: scroll, click, double-click; shift-click and shift-scroll on
  multi-select mode

-#### Extended-search mode
+#### Search syntax

-With `-x` or `--extended` option, fzf will start in "extended-search mode".
+Unless otherwise specified, fzf starts in "extended-search mode" where you can
+type in multiple search terms delimited by spaces. e.g. `^music .mp3$ sbtrkt
+!rmx`

-In this mode, you can specify multiple patterns delimited by spaces,
-such as: `^music .mp3$ sbtrkt !rmx`
-
-| Token    | Description                      | Match type           |
-| -------- | -------------------------------- | -------------------- |
-| `^music` | Items that start with `music`    | prefix-exact-match   |
-| `.mp3$`  | Items that end with `.mp3`       | suffix-exact-match   |
-| `sbtrkt` | Items that match `sbtrkt`        | fuzzy-match          |
-| `!rmx`   | Items that do not match `rmx`    | inverse-fuzzy-match  |
-| `'wild`  | Items that include `wild`        | exact-match (quoted) |
-| `!'fire` | Items that do not include `fire` | inverse-exact-match  |
+| Token    | Match type           | Description                      |
+| -------- | -------------------- | -------------------------------- |
+| `sbtrkt` | fuzzy-match          | Items that match `sbtrkt`        |
+| `^music` | prefix-exact-match   | Items that start with `music`    |
+| `.mp3$`  | suffix-exact-match   | Items that end with `.mp3`       |
+| `'wild`  | exact-match (quoted) | Items that include `wild`        |
+| `!rmx`   | inverse-fuzzy-match  | Items that do not match `rmx`    |
+| `!'fire` | inverse-exact-match  | Items that do not include `fire` |

 If you don't prefer fuzzy matching and do not wish to "quote" every word,
-start fzf with `-e` or `--extended-exact` option. Note that in
-`--extended-exact` mode, `'`-prefix "unquotes" the term.
+start fzf with `-e` or `--exact` option. Note that when  `--exact` is set,
+`'`-prefix "unquotes" the term.
+
+A single bar character term acts as an OR operator. For example, the following
+query matches entries that start with `core` and end with either `go`, `rb`,
+or `py`.
+
+```
+^core go$ | rb$ | py$
+```

 #### Environment variables

 - `FZF_DEFAULT_COMMAND`
    - Default command to use when input is tty
+    - e.g. `export FZF_DEFAULT_COMMAND='ag -g ""'`
 - `FZF_DEFAULT_OPTS`
-    - Default options. e.g. `export FZF_DEFAULT_OPTS="--extended --cycle"`
+    - Default options
+    - e.g. `export FZF_DEFAULT_OPTS="--reverse --inline-info"`

 Examples
 --------
@@ -250,6 +259,25 @@ export FZF_COMPLETION_TRIGGER='~~'

 # Options to fzf command
 export FZF_COMPLETION_OPTS='+c -x'
+
+# Use ag instead of the default find command for listing candidates.
+# - The first argument to the function is the base path to start traversal
+# - Note that ag only lists files not directories
+# - See the source code (completion.{bash,zsh}) for the details.
+_fzf_compgen_path() {
+  ag -g "" "$1"
+}
+```
+
+#### Supported commands
+
+On bash, fuzzy completion is enabled only for a predefined set of commands
+(`complete | grep _fzf` to see the list). But you can enable it for other
+commands as well like follows.
+
+```sh
+# There are also _fzf_path_completion and _fzf_dir_completion
+complete -F _fzf_file_completion -o default -o bashdefault doge
 ```

 Usage as Vim plugin
@@ -335,10 +363,10 @@ filtering:

 ```sh
 # Feed the output of ag into fzf
-ag -l -g "" | fzf
+ag -g "" | fzf

 # Setting ag as the default source for fzf
-export FZF_DEFAULT_COMMAND='ag -l -g ""'
+export FZF_DEFAULT_COMMAND='ag -g ""'

 # Now fzf (w/o pipe) will use ag instead of find
 fzf
@@ -355,7 +383,8 @@ speed of the traversal.
 ```sh
 export FZF_DEFAULT_COMMAND='
  (git ls-tree -r --name-only HEAD ||
-   find * -name ".*" -prune -o -type f -print -o -type l -print) 2> /dev/null'
+   find . -path "*/\.*" -prune -o -type f -print -o -type l -print |
+      sed s/^..//) 2> /dev/null'
 ```

 #### Fish shell
--- a/bin/fzf-tmux
+++ b/bin/fzf-tmux
@@ -82,11 +82,19 @@ while [ $# -gt 0 ]; do
  shift
 done

-if [ -z "$TMUX_PANE" ] || tmux list-panes -F '#F' | grep -q Z; then
+if [ -z "$TMUX" ]; then
  fzf "${args[@]}"
  exit $?
 fi

+# Handle zoomed tmux pane by moving it to a temp window
+if tmux list-panes -F '#F' | grep -q Z; then
+  zoomed=1
+  original_window=$(tmux display-message -p "#{window_id}")
+  tmp_window=$(tmux new-window -d -P -F "#{window_id}" "bash -c 'while :; do for c in \\| / - \\\\; do sleep 0.2; printf \"\\r\$c fzf-tmux is running\\r\"; done; done'")
+  tmux swap-pane -t $tmp_window \; select-window -t $tmp_window
+fi
+
 set -e

 # Clean up named pipes on exit
@@ -97,6 +105,14 @@ fifo2="${TMPDIR:-/tmp}/fzf-fifo2-$id"
 fifo3="${TMPDIR:-/tmp}/fzf-fifo3-$id"
 cleanup() {
  rm -f $argsf $fifo1 $fifo2 $fifo3
+
+  # Remove temp window if we were zoomed
+  if [ -n "$zoomed" ]; then
+    tmux swap-pane -t $original_window \; \
+      select-window -t $original_window \; \
+      kill-window -t $tmp_window \; \
+      resize-pane -Z
+  fi
 }
 trap cleanup EXIT SIGINT SIGTERM

@@ -111,8 +127,8 @@ envs="env TERM=$TERM "
 [ -n "$FZF_DEFAULT_OPTS"    ] && envs="$envs FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS")"
 [ -n "$FZF_DEFAULT_COMMAND" ] && envs="$envs FZF_DEFAULT_COMMAND=$(printf %q "$FZF_DEFAULT_COMMAND")"

-mkfifo $fifo2
-mkfifo $fifo3
+mkfifo -m o+w $fifo2
+mkfifo -m o+w $fifo3

 # Build arguments to fzf
 opts=""
@@ -125,11 +141,13 @@ done
 if [ -n "$term" -o -t 0 ]; then
  cat <<< "$fzf $opts > $fifo2; echo \$? > $fifo3 $close" > $argsf
  tmux set-window-option -q synchronize-panes off \;\
+    set-window-option -q remain-on-exit off \;\
    split-window $opt "cd $(printf %q "$PWD");$envs bash $argsf" $swap
 else
  mkfifo $fifo1
  cat <<< "$fzf $opts < $fifo1 > $fifo2; echo \$? > $fifo3 $close" > $argsf
  tmux set-window-option -q synchronize-panes off \;\
+    set-window-option -q remain-on-exit off \;\
    split-window $opt "$envs bash $argsf" $swap
  cat <&0 > $fifo1 &
 fi
--- a/4
+++ b/4
@@ -370,7 +370,7 @@ class FZF
    +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])
+                          integer or a range expression ([BEGIN]..[END]).
        --with-nth=N[,..] Transform the item using index expressions for search
    -d, --delimiter=STR   Field delimiter regex for --nth (default: AWK-style)

@@ -396,7 +396,7 @@ class FZF

  Environment variables
    FZF_DEFAULT_COMMAND   Default command to use when input is tty
-    FZF_DEFAULT_OPTS      Defaults options. (e.g. "-x -m --sort 10000")] + $/ + $/
+    FZF_DEFAULT_OPTS      Default options (e.g. "-x -m --sort 10000")] + $/ + $/
   exit x
  end

--- a/143
+++ b/143
@@ -1,12 +1,65 @@
 #!/usr/bin/env bash

-[[ "$@" =~ --pre ]] && version=0.10.7 pre=1 ||
-                       version=0.10.7 pre=0
+set -u
+
+[[ "$@" =~ --pre ]] && version=0.11.3 pre=1 ||
+                       version=0.11.3 pre=0
+
+auto_completion=
+key_bindings=
+update_config=1
+binary_arch=
+
+help() {
+  cat << EOF
+usage: $0 [OPTIONS]
+
+    --help               Show this message
+    --bin                Download fzf binary only; Do not generate ~/.fzf.{bash,zsh}
+    --all                Download fzf binary and update configuration files
+                         to enable key bindings and fuzzy completion
+    --[no-]key-bindings  Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)
+    --[no-]completion    Enable/disable fuzzy completion (bash & zsh)
+    --[no-]update-rc     Whether or not to update shell configuration files
+
+    --32                 Download 32-bit binary
+    --64                 Download 64-bit binary
+EOF
+}
+
+for opt in $@; do
+  case $opt in
+    --help)
+      help
+      exit 0
+      ;;
+    --all)
+      auto_completion=1
+      key_bindings=1
+      update_config=1
+      ;;
+    --key-bindings)    key_bindings=1    ;;
+    --no-key-bindings) key_bindings=0    ;;
+    --completion)      auto_completion=1 ;;
+    --no-completion)   auto_completion=0 ;;
+    --update-rc)       update_config=1   ;;
+    --no-update-rc)    update_config=0   ;;
+    --32)              binary_arch=386   ;;
+    --64)              binary_arch=amd64 ;;
+    --bin)             ;;
+    *)
+      echo "unknown option: $opt"
+      help
+      exit 1
+      ;;
+  esac
+done

 cd $(dirname $BASH_SOURCE)
-fzf_base=$(pwd)
+fzf_base="$(pwd)"

 # If stdin is a tty, we are "interactive".
+interactive=
 [ -t 0 ] && interactive=yes

 ask() {
@@ -16,7 +69,7 @@ ask() {

  read -p "$1 ([y]/n) " $read_n -r
  echo
-  [[ ! $REPLY =~ ^[Nn]$ ]]
+  [[ $REPLY =~ ^[Nn]$ ]]
 }

 check_binary() {
@@ -55,9 +108,16 @@ download() {
    if [ -x "$fzf_base"/bin/fzf ]; then
      echo "  - Already exists"
      check_binary && return
-    elif [ -x "$fzf_base"/bin/$1 ]; then
+    fi
+    if [ -x "$fzf_base"/bin/$1 ]; then
      symlink $1 && check_binary && return
    fi
+    if which_fzf="$(which fzf 2> /dev/null)"; then
+      echo "  - Found in \$PATH"
+      echo "  - Creating symlink: $which_fzf -> bin/fzf"
+      (cd "$fzf_base"/bin && rm -f fzf && ln -sf "$which_fzf" fzf)
+      check_binary && return
+    fi
  fi
  mkdir -p "$fzf_base"/bin && cd "$fzf_base"/bin
  if [ $? -ne 0 ]; then
@@ -88,10 +148,10 @@ archi=$(uname -sm)
 binary_available=1
 binary_error=""
 case "$archi" in
-  Darwin\ x86_64) download fzf-$version-darwin_amd64 ;;
-  Darwin\ i*86)   download fzf-$version-darwin_386   ;;
-  Linux\ x86_64)  download fzf-$version-linux_amd64  ;;
-  Linux\ i*86)    download fzf-$version-linux_386    ;;
+  Darwin\ x86_64) download fzf-$version-darwin_${binary_arch:-amd64} ;;
+  Darwin\ i*86)   download fzf-$version-darwin_${binary_arch:-386}   ;;
+  Linux\ x86_64)  download fzf-$version-linux_${binary_arch:-amd64}  ;;
+  Linux\ i*86)    download fzf-$version-linux_${binary_arch:-386}    ;;
  *)              binary_available=0 binary_error=1  ;;
 esac

@@ -173,12 +233,16 @@ fi
 [[ "$*" =~ "--bin" ]] && exit 0

 # Auto-completion
-ask "Do you want to add auto-completion support?"
+if [ -z "$auto_completion" ]; then
+  ask "Do you want to enable fuzzy auto-completion?"
  auto_completion=$?
+fi

 # Key-bindings
-ask "Do you want to add key bindings?"
+if [ -z "$key_bindings" ]; then
+  ask "Do you want to enable key bindings?"
  key_bindings=$?
+fi

 echo
 for shell in bash zsh; do
@@ -186,12 +250,12 @@ for shell in bash zsh; do
  src=~/.fzf.${shell}

  fzf_completion="[[ \$- == *i* ]] && source \"$fzf_base/shell/completion.${shell}\" 2> /dev/null"
-  if [ $auto_completion -ne 0 ]; then
+  if [ $auto_completion -eq 0 ]; then
    fzf_completion="# $fzf_completion"
  fi

  fzf_key_bindings="source \"$fzf_base/shell/key-bindings.${shell}\""
-  if [ $key_bindings -ne 0 ]; then
+  if [ $key_bindings -eq 0 ]; then
    fzf_key_bindings="# $fzf_key_bindings"
  fi

@@ -237,29 +301,45 @@ EOF
    rm -f ~/.config/fish/functions/fzf.fish && echo "OK" || echo "Failed"
  fi

-  if [ $key_bindings -eq 0 ]; then
-    echo -n "Symlink ~/.config/fish/functions/fzf_key_bindings.fish ... "
-    ln -sf $fzf_base/shell/key-bindings.fish \
-           ~/.config/fish/functions/fzf_key_bindings.fish && echo "OK" || echo "Failed"
+  fish_binding=~/.config/fish/functions/fzf_key_bindings.fish
+  if [ $key_bindings -ne 0 ]; then
+    echo -n "Symlink $fish_binding ... "
+    ln -sf "$fzf_base/shell/key-bindings.fish" \
+           "$fish_binding" && echo "OK" || echo "Failed"
+  else
+    echo -n "Removing $fish_binding ... "
+    rm -f "$fish_binding"
+    echo "OK"
  fi
 fi

 append_line() {
  set -e
-  echo "Update $2:"
-  echo "  - $1"
-  [ -f "$2" ] || touch "$2"
-  if [ $# -lt 3 ]; then
-    line=$(\grep -nF "$1" "$2" | sed 's/:.*//' | tr '\n' ' ')
+
+  local skip line file pat lno
+  skip="$1"
+  line="$2"
+  file="$3"
+  pat="${4:-}"
+
+  echo "Update $file:"
+  echo "  - $line"
+  [ -f "$file" ] || touch "$file"
+  if [ $# -lt 4 ]; then
+    lno=$(\grep -nF "$line" "$file" | sed 's/:.*//' | tr '\n' ' ')
  else
-    line=$(\grep -nF "$3" "$2" | sed 's/:.*//' | tr '\n' ' ')
+    lno=$(\grep -nF "$pat" "$file" | sed 's/:.*//' | tr '\n' ' ')
  fi
-  if [ -n "$line" ]; then
-    echo "    - Already exists: line #$line"
+  if [ -n "$lno" ]; then
+    echo "    - Already exists: line #$lno"
  else
-    echo >> "$2"
-    echo "$1" >> "$2"
+    if [ $skip -eq 1 ]; then
+      echo >> "$file"
+      echo "$line" >> "$file"
      echo "    + Added"
+    else
+      echo "    ~ Skipped"
+    fi
  fi
  echo
  set +e
@@ -267,18 +347,19 @@ append_line() {

 echo
 for shell in bash zsh; do
-  append_line "[ -f ~/.fzf.${shell} ] && source ~/.fzf.${shell}" ~/.${shell}rc "~/.fzf.${shell}"
+  [ $shell = zsh ] && dest=${ZDOTDIR:-~}/.zshrc || dest=~/.bashrc
+  append_line $update_config "[ -f ~/.fzf.${shell} ] && source ~/.fzf.${shell}" "$dest" "~/.fzf.${shell}"
 done

-if [ $key_bindings -eq 0 -a $has_fish -eq 1 ]; then
+if [ $key_bindings -eq 1 -a $has_fish -eq 1 ]; then
  bind_file=~/.config/fish/functions/fish_user_key_bindings.fish
-  append_line "fzf_key_bindings" "$bind_file"
+  append_line $update_config "fzf_key_bindings" "$bind_file"
 fi

 cat << EOF
 Finished. Restart your shell or reload config file.
   source ~/.bashrc  # bash
-   source ~/.zshrc   # zsh
+   source ${ZDOTDIR:-~}/.zshrc   # zsh
 EOF
 [ $has_fish -eq 1 ] && echo "   fzf_key_bindings  # fish"; cat << EOF

--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -1,7 +1,7 @@
 .ig
 The MIT License (MIT)

-Copyright (c) 2015 Junegunn Choi
+Copyright (c) 2016 Junegunn Choi

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf 1 "Oct 2015" "fzf 0.10.7" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Feb 2016" "fzf 0.11.3" "fzf - a command-line fuzzy finder"

 .SH NAME
 fzf - a command-line fuzzy finder
@@ -36,10 +36,11 @@ fzf is a general-purpose command-line fuzzy finder.
 .SS Search mode
 .TP
 .B "-x, --extended"
-Extended-search mode
+Extended-search mode. Since 0.10.9, this is enabled by default. You can disable
+it with \fB+x\fR or \fB--no-extended\fR.
 .TP
-.B "-e, --extended-exact"
-Extended-search mode (exact match)
+.B "-e, --exact"
+Enable exact-match
 .TP
 .B "-i"
 Case-insensitive match (default: smart-case match)
@@ -67,8 +68,8 @@ Reverse the order of the input
 e.g. \fBhistory | fzf --tac --no-sort\fR
 .RE
 .TP
-.BI "--tiebreak=" "CRI"
-Sort criterion to use when the scores are tied
+.BI "--tiebreak=" "CRI[,..]"
+Comma-separated list of sort criteria to apply when the scores are tied.
 .br
 .R ""
 .br
@@ -80,6 +81,15 @@ Sort criterion to use when the scores are tied
 .br
 .BR index "   Prefers item that appeared earlier in the input stream"
 .br
+.R ""
+.br
+- Each criterion should appear only once in the list
+.br
+- \fBindex\fR is only allowed at the end of the list
+.br
+- \fBindex\fR is implicitly appended to the list when not specified
+.br
+- Default is \fBlength\fR (or equivalently \fBlength\fR,index)
 .SS Interface
 .TP
 .B "-m, --multi"
@@ -156,6 +166,9 @@ e.g. \fBfzf --margin 10%\fR
     \fBfzf --margin 1,5%\fR
 .RE
 .TP
+.BI "--tabstop=" SPACES
+Number of spaces for a tab character (default: 8)
+.TP
 .B "--cycle"
 Enable cyclic scroll
 .TP
@@ -179,11 +192,11 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
 .RE

 .RS
-.B AVAILABLE KEYS:
+.B AVAILABLE KEYS:    (SYNONYMS)
    \fIctrl-[a-z]\fR
    \fIalt-[a-z]\fR
    \fIf[1-4]\fR
-    \fIenter\fR       (\fIreturn\fR)
+    \fIenter\fR       (\fIreturn\fR \fIctrl-m\fR)
    \fIspace\fR
    \fIbspace\fR      (\fIbs\fR)
    \fIalt-bspace\fR  (\fIalt-bs\fR)
@@ -201,13 +214,14 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
    \fIpgdn\fR        (\fIpage-down\fR)
    \fIshift-left\fR
    \fIshift-right\fR
+    \fIdouble-click\fR
    or any single character
 .RE

 .RS
-  \fBACTION:               DEFAULT BINDINGS:
+  \fBACTION:               DEFAULT BINDINGS (NOTES):
    \fBabort\fR                 \fIctrl-c  ctrl-g  ctrl-q  esc\fR
-    \fBaccept\fR                \fIctrl-m  (enter)\fR
+    \fBaccept\fR                \fIenter   double-click\fR
    \fBbackward-char\fR         \fIctrl-b  left\fR
    \fBbackward-delete-char\fR  \fIctrl-h  bspace\fR
    \fBbackward-kill-word\fR    \fIalt-bs\fR
@@ -221,6 +235,7 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
    \fBdown\fR                  \fIctrl-j  ctrl-n  down\fR
    \fBend-of-line\fR           \fIctrl-e  end\fR
    \fBexecute(...)\fR          (see below for the details)
+    \fBexecute-multi(...)\fR    (see below for the details)
    \fBforward-char\fR          \fIctrl-f  right\fR
    \fBforward-word\fR          \fIalt-f   shift-right\fR
    \fBignore\fR
@@ -234,6 +249,8 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
    \fBtoggle\fR
    \fBtoggle-all\fR
    \fBtoggle-down\fR           \fIctrl-i  (tab)\fR
+    \fBtoggle-in\fR             (\fB--reverse\fR ? \fBtoggle-up\fR : \fBtoggle-down\fR)
+    \fBtoggle-out\fR            (\fB--reverse\fR ? \fBtoggle-down\fR : \fBtoggle-up\fR)
    \fBtoggle-sort\fR           (equivalent to \fB--toggle-sort\fR)
    \fBtoggle-up\fR             \fIbtab    (shift-tab)\fR
    \fBunix-line-discard\fR     \fIctrl-u\fR
@@ -274,6 +291,12 @@ This is the special form that frees you from parse errors as it does not expect
 the closing character. The catch is that it should be the last one in the
 comma-separated list.
 .RE
+
+\fBexecute-multi(...)\fR is an alternative action that executes the command
+with the selected entries when multi-select is enabled (\fB--multi\fR). With
+this action, \fB{}\fR is replaced with the double-quoted strings of the
+selected entries separated by spaces.
+
 .RE
 .TP
 .BI "--history=" "HISTORY_FILE"
@@ -369,9 +392,9 @@ of field index expressions.

 .SH EXTENDED SEARCH MODE

-With \fB-x\fR or \fB--extended\fR option, fzf will start in "extended-search
-mode". In this mode, you can specify multiple patterns delimited by spaces,
-such as: \fB'wild ^music .mp3$ sbtrkt !rmx\fR
+Unless specified otherwise, fzf will start in "extended-search mode". In this
+mode, you can specify multiple patterns delimited by spaces, such as: \fB'wild
+^music .mp3$ sbtrkt !rmx\fR

 .SS Exact-match (quoted)
 A term that is prefixed by a single-quote character (\fB'\fR) is interpreted as
@@ -387,11 +410,17 @@ with the given string. An anchored-match term is also an exact-match term.
 If a term is prefixed by \fB!\fR, fzf will exclude the items that satisfy the
 term from the result.

-.SS Extended-exact mode
+.SS Exact-match by default
 If you don't prefer fuzzy matching and do not wish to "quote" (prefixing with
-\fB'\fR) every word, start fzf with \fB-e\fR or \fB--extended-exact\fR option
-(instead of \fB-x\fR or \fB--extended\fR). Note that in \fB--extended-exact\fR
-mode, \fB'\fR-prefix "unquotes" the term.
+\fB'\fR) every word, start fzf with \fB-e\fR or \fB--exact\fR option. Note that
+when \fB--exact\fR is set, \fB'\fR-prefix "unquotes" the term.
+
+.SS OR operator
+A single bar character term acts as an OR operator. For example, the following
+query matches entries that start with \fBcore\fR and end with either \fBgo\fR,
+\fBrb\fR, or \fBpy\fR.
+
+e.g. \fB^core go$ | rb$ | py$\fR

 .SH AUTHOR
 Junegunn Choi (\fIjunegunn.c@gmail.com\fR)
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -1,4 +1,4 @@
-" Copyright (c) 2015 Junegunn Choi
+" Copyright (c) 2016 Junegunn Choi
 "
 " MIT License
 "
@@ -52,17 +52,13 @@ function! s:fzf_exec()
  return s:exec
 endfunction

-function! s:tmux_not_zoomed()
-  return system('tmux list-panes -F "#F"') !~# 'Z'
-endfunction
-
 function! s:tmux_enabled()
  if has('gui_running')
    return 0
  endif

  if exists('s:tmux')
-    return s:tmux && s:tmux_not_zoomed()
+    return s:tmux
  endif

  let s:tmux = 0
@@ -70,7 +66,7 @@ function! s:tmux_enabled()
    let output = system('tmux -V')
    let s:tmux = !v:shell_error && output >= 'tmux 1.7'
  endif
-  return s:tmux && s:tmux_not_zoomed()
+  return s:tmux
 endfunction

 function! s:shellesc(arg)
@@ -143,17 +139,13 @@ try
  let tmux = !has('nvim') && s:tmux_enabled() && s:splittable(dict)
  let command = prefix.(tmux ? s:fzf_tmux(dict) : fzf_exec).' '.optstr.' > '.temps.result

-  try
-    if tmux
-      return s:execute_tmux(dict, command, temps)
-    elseif has('nvim')
+  if has('nvim')
    return s:execute_term(dict, command, temps)
-    else
-      return s:execute(dict, command, temps)
  endif
-  finally
-    call s:popd(dict)
-  endtry
+
+  let ret = tmux ? s:execute_tmux(dict, command, temps) : s:execute(dict, command, temps)
+  call s:popd(dict, ret)
+  return ret
 finally
  let &shell = oshell
 endtry
@@ -197,16 +189,28 @@ function! s:pushd(dict)
      return 1
    endif
    let a:dict.prev_dir = cwd
-    execute 'chdir '.s:escape(a:dict.dir)
+    execute 'chdir' s:escape(a:dict.dir)
    let a:dict.dir = getcwd()
    return 1
  endif
  return 0
 endfunction

-function! s:popd(dict)
-  if has_key(a:dict, 'prev_dir')
-    execute 'chdir '.s:escape(remove(a:dict, 'prev_dir'))
+function! s:popd(dict, lines)
+  " Since anything can be done in the sink function, there is no telling that
+  " the change of the working directory was made by &autochdir setting.
+  "
+  " We use the following heuristic to determine whether to restore CWD:
+  " - Always restore the current directory when &autochdir is disabled.
+  "   FIXME This makes it impossible to change directory from inside the sink
+  "   function when &autochdir is not used.
+  " - In case of an error or an interrupt, a:lines will be empty.
+  "   And it will be an array of a single empty string when fzf was finished
+  "   without a match. In these cases, we presume that the change of the
+  "   directory is not expected and should be undone.
+  if has_key(a:dict, 'prev_dir') &&
+        \ (!&autochdir || (empty(a:lines) || len(a:lines) == 1 && empty(a:lines[0])))
+    execute 'chdir' s:escape(remove(a:dict, 'prev_dir'))
  endif
 endfunction

@@ -318,7 +322,6 @@ endfunction

 function! s:execute_term(dict, command, temps)
  call s:split(a:dict)
-  call s:pushd(a:dict)

  let fzf = { 'buf': bufnr('%'), 'dict': a:dict, 'temps': a:temps, 'name': 'FZF' }
  let s:command = a:command
@@ -342,7 +345,7 @@ function! s:execute_term(dict, command, temps)

    call s:pushd(self.dict)
    try
-      call s:callback(self.dict, self.temps)
+      let ret = s:callback(self.dict, self.temps)

      if inplace && bufnr('') == self.buf
        execute "normal! \<c-^>"
@@ -352,11 +355,15 @@ function! s:execute_term(dict, command, temps)
        endif
      endif
    finally
-      call s:popd(self.dict)
+      call s:popd(self.dict, ret)
    endtry
  endfunction

+  call s:pushd(a:dict)
  call termopen(a:command, fzf)
+  call s:popd(a:dict, [])
+  setlocal nospell
+  setf fzf
  startinsert
  return []
 endfunction
@@ -412,10 +419,19 @@ function! s:cmd_callback(lines) abort
    augroup END
  endif
  try
+    let empty = empty(expand('%')) && line('$') == 1 && empty(getline(1)) && !&modified
    let autochdir = &autochdir
    set noautochdir
    for item in a:lines
+      if empty
+        execute 'e' s:escape(item)
+        let empty = 0
+      else
        execute cmd s:escape(item)
+      endif
+      if exists('#BufEnter') && isdirectory(item)
+        doautocmd BufEnter
+      endif
    endfor
  finally
    let &autochdir = autochdir
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -10,9 +10,29 @@
 # - $FZF_COMPLETION_TRIGGER (default: '**')
 # - $FZF_COMPLETION_OPTS    (default: empty)

+# To use custom commands instead of find, override _fzf_compgen_{path,dir}
+if ! declare -f _fzf_compgen_path > /dev/null; then
+  _fzf_compgen_path() {
+    echo "$1"
+    \find -L "$1" \
+      -name .git -prune -o -name .svn -prune -o \( -type d -o -type f -o -type l \) \
+      -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
+  }
+fi
+
+if ! declare -f _fzf_compgen_dir > /dev/null; then
+  _fzf_compgen_dir() {
+    \find -L "$1" \
+      -name .git -prune -o -name .svn -prune -o -type d \
+      -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
+  }
+fi
+
+###########################################################
+
 _fzf_orig_completion_filter() {
-  sed 's/.*-F *\([^ ]*\).* \([^ ]*\)$/export _fzf_orig_completion_\2=\1;/' |
-  sed 's/[^a-z0-9_= ;]/_/g'
+  sed 's/^\(.*-F\) *\([^ ]*\).* \([^ ]*\)$/export _fzf_orig_completion_\3="\1 %s \3 #\2";/' |
+  awk -F= '{gsub(/[^a-z0-9_= ;]/, "_", $1); print $1"="$2}'
 }

 _fzf_opts_completion() {
@@ -22,7 +42,7 @@ _fzf_opts_completion() {
  prev="${COMP_WORDS[COMP_CWORD-1]}"
  opts="
    -x --extended
-    -e --extended-exact
+    -e --exact
    -i +i
    -n --nth
    -d --delimiter
@@ -77,12 +97,12 @@ _fzf_opts_completion() {
 }

 _fzf_handle_dynamic_completion() {
-  local cmd orig ret orig_cmd
+  local cmd orig_var orig ret orig_cmd
  cmd="$1"
  shift
  orig_cmd="$1"
-
-  orig=$(eval "echo \$_fzf_orig_completion_$cmd")
+  orig_var="_fzf_orig_completion_$cmd"
+  orig="${!orig_var##*#}"
  if [ -n "$orig" ] && type "$orig" > /dev/null 2>&1; then
    $orig "$@"
  elif [ -n "$_fzf_completion_loader" ]; then
@@ -110,9 +130,10 @@ __fzf_generic_path_completion() {
      if [ -z "$dir" -o -d "$dir" ]; then
        leftover=${base/#"$dir"}
        leftover=${leftover/#\/}
-        [ "$dir" = './' ] && dir=''
+        [ -z "$dir" ] && dir='.'
+        [ "$dir" != "/" ] && dir="${dir/%\//}"
        tput sc
-        matches=$(find -L "$dir"* $1 2> /dev/null | $fzf $FZF_COMPLETION_OPTS $2 -q "$leftover" | while read item; do
+        matches=$(eval "$1 $(printf %q "$dir")" | $fzf $FZF_COMPLETION_OPTS $2 -q "$leftover" | while read item; do
          printf "%q$3 " "$item"
        done)
        matches=${matches% }
@@ -135,15 +156,10 @@ __fzf_generic_path_completion() {
  fi
 }

-_fzf_feed_fifo() (
-  rm -f "$fifo"
-  mkfifo "$fifo"
-  cat <&0 > "$fifo" &
-)
-
 _fzf_complete() {
-  local fifo cur selected trigger cmd fzf
-  fifo="${TMPDIR:-/tmp}/fzf-complete-fifo-$$"
+  local cur selected trigger cmd fzf post
+  post="$(caller 0 | awk '{print $2}')_post"
+  type -t $post > /dev/null 2>&1 || post=cat
  [ ${FZF_TMUX:-1} -eq 1 ] && fzf="fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%}" || fzf="fzf"

  cmd=$(echo ${COMP_WORDS[0]} | sed 's/[^a-z0-9_=]/_/g')
@@ -152,12 +168,10 @@ _fzf_complete() {
  if [[ ${cur} == *"$trigger" ]]; then
    cur=${cur:0:${#cur}-${#trigger}}

-    _fzf_feed_fifo "$fifo"
    tput sc
-    selected=$(eval "cat '$fifo' | $fzf $FZF_COMPLETION_OPTS $1 -q '$cur'" | tr '\n' ' ')
+    selected=$(cat | $fzf $FZF_COMPLETION_OPTS $1 -q "$cur" | $post | tr '\n' ' ')
    selected=${selected% } # Strip trailing space not to repeat "-o nospace"
    tput rc
-    rm -f "$fifo"

    if [ -n "$selected" ]; then
      COMPREPLY=("$selected")
@@ -170,21 +184,16 @@ _fzf_complete() {
 }

 _fzf_path_completion() {
-  __fzf_generic_path_completion \
-    "-name .git -prune -o -name .svn -prune -o -type d -print -o -type f -print -o -type l -print" \
-    "-m" "" "$@"
+  __fzf_generic_path_completion _fzf_compgen_path "-m" "" "$@"
 }

+# Deprecated. No file only completion.
 _fzf_file_completion() {
-  __fzf_generic_path_completion \
-    "-name .git -prune -o -name .svn -prune -o -type f -print -o -type l -print" \
-    "-m" "" "$@"
+  _fzf_path_completion "$@"
 }

 _fzf_dir_completion() {
-  __fzf_generic_path_completion \
-    "-name .git -prune -o -name .svn -prune -o -type d -print" \
-    "" "/" "$@"
+  __fzf_generic_path_completion _fzf_compgen_dir "" "/" "$@"
 }

 _fzf_complete_kill() {
@@ -238,13 +247,12 @@ _fzf_complete_unalias() {
 # fzf options
 complete -o default -F _fzf_opts_completion fzf

-d_cmds="cd pushd rmdir"
-f_cmds="
-  awk cat diff diff3
-  emacs ex file ftp g++ gcc gvim head hg java
-  javac ld less more mvim patch perl python ruby
-  sed sftp sort source tail tee uniq vi view vim wc"
+d_cmds="${FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir}"
 a_cmds="
+  awk cat diff diff3
+  emacs emacsclient ex file ftp g++ gcc gvim head hg java
+  javac ld less more mvim nvim patch perl python ruby
+  sed sftp sort source tail tee uniq vi view vim wc xdg-open
  basename bunzip2 bzip2 chmod chown curl cp dirname du
  find git grep gunzip gzip hg jar
  ln ls mv open rm rsync scp
@@ -252,32 +260,43 @@ a_cmds="
 x_cmds="kill ssh telnet unset unalias export"

 # Preserve existing completion
-if [ "$_fzf_completion_loaded" != '0.9.12' ]; then
+if [ "$_fzf_completion_loaded" != '0.11.3' ]; then
  # Really wish I could use associative array but OSX comes with bash 3.2 :(
  eval $(complete | \grep '\-F' | \grep -v _fzf_ |
-    \grep -E " ($(echo $d_cmds $f_cmds $a_cmds $x_cmds | sed 's/ /|/g' | sed 's/+/\\+/g'))$" | _fzf_orig_completion_filter)
-  export _fzf_completion_loaded=0.9.12
+    \grep -E " ($(echo $d_cmds $a_cmds $x_cmds | sed 's/ /|/g' | sed 's/+/\\+/g'))$" | _fzf_orig_completion_filter)
+  export _fzf_completion_loaded=0.11.3
 fi

 if type _completion_loader > /dev/null 2>&1; then
  _fzf_completion_loader=1
 fi

-# Directory
-for cmd in $d_cmds; do
-  complete -F _fzf_dir_completion -o nospace -o plusdirs $cmd
-done
-
-# File
-for cmd in $f_cmds; do
-  complete -F _fzf_file_completion -o default -o bashdefault $cmd
-done
+_fzf_defc() {
+  local cmd func opts orig_var orig
+  cmd="$1"
+  func="$2"
+  opts="$3"
+  orig_var="_fzf_orig_completion_$cmd"
+  orig="${!orig_var}"
+  if [ -n "$orig" ]; then
+    eval "$(printf "$orig" "$func")"
+  else
+    complete -F "$func" $opts "$cmd"
+  fi
+}

 # Anything
 for cmd in $a_cmds; do
-  complete -F _fzf_path_completion -o default -o bashdefault $cmd
+  _fzf_defc "$cmd" _fzf_path_completion "-o default -o bashdefault"
 done

+# Directory
+for cmd in $d_cmds; do
+  _fzf_defc "$cmd" _fzf_dir_completion "-o nospace -o plusdirs"
+done
+
+unset _fzf_defc
+
 # Kill completion
 complete -F _fzf_complete_kill -o nospace -o default -o bashdefault kill

@@ -290,4 +309,4 @@ complete -F _fzf_complete_unset -o default -o bashdefault unset
 complete -F _fzf_complete_export -o default -o bashdefault export
 complete -F _fzf_complete_unalias -o default -o bashdefault unalias

-unset cmd d_cmds f_cmds a_cmds x_cmds
+unset cmd d_cmds a_cmds x_cmds
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -10,18 +10,38 @@
 # - $FZF_COMPLETION_TRIGGER (default: '**')
 # - $FZF_COMPLETION_OPTS    (default: empty)

+# To use custom commands instead of find, override _fzf_compgen_{path,dir}
+if ! declare -f _fzf_compgen_path > /dev/null; then
+  _fzf_compgen_path() {
+    echo "$1"
+    \find -L "$1" \
+      -name .git -prune -o -name .svn -prune -o \( -type d -o -type f -o -type l \) \
+      -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
+  }
+fi
+
+if ! declare -f _fzf_compgen_dir > /dev/null; then
+  _fzf_compgen_dir() {
+    \find -L "$1" \
+      -name .git -prune -o -name .svn -prune -o -type d \
+      -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
+  }
+fi
+
+###########################################################
+
 __fzf_generic_path_completion() {
-  local base lbuf find_opts fzf_opts suffix tail fzf dir leftover matches nnm
+  local base lbuf compgen fzf_opts suffix tail fzf dir leftover matches nnm
  # (Q) flag removes a quoting level: "foo\ bar" => "foo bar"
  base=${(Q)1}
  lbuf=$2
-  find_opts=$3
+  compgen=$3
  fzf_opts=$4
  suffix=$5
  tail=$6
  [ ${FZF_TMUX:-1} -eq 1 ] && fzf="fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%}" || fzf="fzf"

-  if ! setopt | grep nonomatch > /dev/null; then
+  if ! setopt | \grep nonomatch > /dev/null; then
    nnm=1
    setopt nonomatch
  fi
@@ -30,9 +50,10 @@ __fzf_generic_path_completion() {
    if [ -z "$dir" -o -d ${~dir} ]; then
      leftover=${base/#"$dir"}
      leftover=${leftover/#\/}
-      [ "$dir" = './' ] && dir=''
+      [ -z "$dir" ] && dir='.'
+      [ "$dir" != "/" ] && dir="${dir/%\//}"
      dir=${~dir}
-      matches=$(\find -L $dir* ${=find_opts} 2> /dev/null | ${=fzf} ${=FZF_COMPLETION_OPTS} ${=fzf_opts} -q "$leftover" | while read item; do
+      matches=$(eval "$compgen $(printf %q "$dir")" | ${=fzf} ${=FZF_COMPLETION_OPTS} ${=fzf_opts} -q "$leftover" | while read item; do
        printf "%q$suffix " "$item"
      done)
      matches=${matches% }
@@ -49,37 +70,29 @@ __fzf_generic_path_completion() {
 }

 _fzf_path_completion() {
-  __fzf_generic_path_completion "$1" "$2" \
-    "-name .git -prune -o -name .svn -prune -o -type d -print -o -type f -print -o -type l -print" \
+  __fzf_generic_path_completion "$1" "$2" _fzf_compgen_path \
    "-m" "" " "
 }

 _fzf_dir_completion() {
-  __fzf_generic_path_completion "$1" "$2" \
-    "-name .git -prune -o -name .svn -prune -o -type d -print" \
+  __fzf_generic_path_completion "$1" "$2" _fzf_compgen_dir \
    "" "/" ""
 }

-_fzf_feed_fifo() (
-  rm -f "$fifo"
-  mkfifo "$fifo"
-  cat <&0 > "$fifo" &
-)
-
 _fzf_complete() {
-  local fifo fzf_opts lbuf fzf matches
-  fifo="${TMPDIR:-/tmp}/fzf-complete-fifo-$$"
+  local fzf_opts lbuf fzf matches post
  fzf_opts=$1
  lbuf=$2
+  post="${funcstack[2]}_post"
+  type $post > /dev/null 2>&1 || post=cat
+
  [ ${FZF_TMUX:-1} -eq 1 ] && fzf="fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%}" || fzf="fzf"

-  _fzf_feed_fifo "$fifo"
-  matches=$(cat "$fifo" | ${=fzf} ${=FZF_COMPLETION_OPTS} ${=fzf_opts} -q "${(Q)prefix}" | tr '\n' ' ')
+  matches=$(cat | ${=fzf} ${=FZF_COMPLETION_OPTS} ${=fzf_opts} -q "${(Q)prefix}" | $post | tr '\n' ' ')
  if [ -n "$matches" ]; then
    LBUFFER="$lbuf$matches"
  fi
  zle redisplay
-  rm -f "$fifo"
 }

 _fzf_complete_telnet() {
@@ -116,11 +129,8 @@ _fzf_complete_unalias() {
 }

 fzf-completion() {
-  local tokens cmd prefix trigger tail fzf matches lbuf d_cmds sws
-  if setopt | grep shwordsplit > /dev/null; then
-    sws=1
-    unsetopt shwordsplit
-  fi
+  local tokens cmd prefix trigger tail fzf matches lbuf d_cmds
+  setopt localoptions noshwordsplit

  # http://zsh.sourceforge.net/FAQ/zshfaq03.html
  # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
@@ -147,7 +157,7 @@ fzf-completion() {
    zle redisplay
  # Trigger sequence given
  elif [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then
-    d_cmds=(cd pushd rmdir)
+    d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir})

    [ -z "$trigger"      ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}}
    [ -z "${tokens[-1]}" ] && lbuf=$LBUFFER        || lbuf=${LBUFFER:0:-${#tokens[-1]}}
@@ -163,12 +173,10 @@ fzf-completion() {
  else
    eval "zle ${fzf_default_completion:-expand-or-complete}"
  fi
-  [ -n "$sws" ] && setopt shwordsplit
 }

 [ -z "$fzf_default_completion" ] &&
-  fzf_default_completion=$(bindkey '^I' | grep -v undefined-key | awk '{print $2}')
+  fzf_default_completion=$(bindkey '^I' | \grep -v undefined-key | awk '{print $2}')

 zle     -N   fzf-completion
 bindkey '^I' fzf-completion
-
--- a/shell/key-bindings.bash
+++ b/shell/key-bindings.bash
@@ -1,7 +1,7 @@
 # Key bindings
 # ------------
 __fzf_select__() {
-  local cmd="${FZF_CTRL_T_COMMAND:-"command \\find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
+  local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
    -o -type f -print \
    -o -type d -print \
    -o -type l -print 2> /dev/null | sed 1d | cut -b3-"}"
@@ -25,13 +25,23 @@ __fzf_select_tmux__() {
  else
    height="-l $height"
  fi
-  tmux split-window $height "cd $(printf %q "$PWD"); FZF_CTRL_T_COMMAND=$(printf %q "$FZF_CTRL_T_COMMAND") bash -c 'source ~/.fzf.bash; tmux send-keys -t $TMUX_PANE \"\$(__fzf_select__)\"'"
+
+  tmux split-window $height "cd $(printf %q "$PWD"); FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS") PATH=$(printf %q "$PATH") FZF_CTRL_T_COMMAND=$(printf %q "$FZF_CTRL_T_COMMAND") bash -c 'source \"${BASH_SOURCE[0]}\"; tmux send-keys -t $TMUX_PANE \"\$(__fzf_select__)\"'"
+}
+
+__fzf_select_tmux_auto__() {
+  if [ ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ]; then
+    __fzf_select_tmux__
+  else
+    tmux send-keys -t $TMUX_PANE "$(__fzf_select__)"
+  fi
 }

 __fzf_cd__() {
-  local dir
-  dir=$(command \find -L ${1:-.} \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
-    -o -type d -print 2> /dev/null | sed 1d | cut -b3- | $(__fzfcmd) +m) && printf 'cd %q' "$dir"
+  local cmd dir
+  cmd="${FZF_ALT_C_COMMAND:-"command find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
+    -o -type d -print 2> /dev/null | sed 1d | cut -b3-"}"
+  dir=$(eval "$cmd" | $(__fzfcmd) +m) && printf 'cd %q' "$dir"
 }

 __fzf_history__() (
@@ -49,7 +59,11 @@ __fzf_history__() (
 )

 __use_tmux=0
-[ -n "$TMUX_PANE" -a ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ] && __use_tmux=1
+__use_tmux_auto=0
+if [ -n "$TMUX_PANE" ]; then
+  [ ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ] && __use_tmux=1
+  [ $BASH_VERSINFO -gt 3 ] && __use_tmux_auto=1
+fi

 if [ -z "$(set -o | \grep '^vi.*on')" ]; then
  # Required to refresh the prompt after fzf
@@ -57,7 +71,9 @@ if [ -z "$(set -o | \grep '^vi.*on')" ]; then
  bind '"\e^": history-expand-line'

  # CTRL-T - Paste the selected file path into the command line
-  if [ $__use_tmux -eq 1 ]; then
+  if [ $__use_tmux_auto -eq 1 ]; then
+    bind -x '"\C-t": "__fzf_select_tmux_auto__"'
+  elif [ $__use_tmux -eq 1 ]; then
    bind '"\C-t": " \C-u \C-a\C-k$(__fzf_select_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$(__fzf_select__)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"'
@@ -75,7 +91,9 @@ else

  # CTRL-T - Paste the selected file path into the command line
  # - FIXME: Selected items are attached to the end regardless of cursor position
-  if [ $__use_tmux -eq 1 ]; then
+  if [ $__use_tmux_auto -eq 1 ]; then
+    bind -x '"\C-t": "__fzf_select_tmux_auto__"'
+  elif [ $__use_tmux -eq 1 ]; then
    bind '"\C-t": "\e$a \eddi$(__fzf_select_tmux__)\C-x\C-e\e0P$xa"'
  else
    bind '"\C-t": "\e$a \eddi$(__fzf_select__)\C-x\C-e\e0Px$a \C-x\C-r\exa "'
@@ -91,6 +109,6 @@ else
  bind -m vi-command '"\ec": "i\ec"'
 fi

-unset __use_tmux
+unset -v __use_tmux __use_tmux_auto

 fi
--- a/shell/key-bindings.fish
+++ b/shell/key-bindings.fish
@@ -20,6 +20,7 @@ function fzf_key_bindings
      -o -type d -print \
      -o -type l -print 2> /dev/null | sed 1d | cut -b3-"
    eval "$FZF_CTRL_T_COMMAND | "(__fzfcmd)" -m > $TMPDIR/fzf.result"
+    and sleep 0
    and commandline -i (cat $TMPDIR/fzf.result | __fzf_escape)
    commandline -f repaint
    rm -f $TMPDIR/fzf.result
@@ -33,9 +34,11 @@ function fzf_key_bindings
  end

  function __fzf_alt_c
+    set -q FZF_ALT_C_COMMAND; or set -l FZF_ALT_C_COMMAND "
+    command find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
+      -o -type d -print 2> /dev/null | sed 1d | cut -b3-"
    # Fish hangs if the command before pipe redirects (2> /dev/null)
-    command find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) \
-      -prune -o -type d -print 2> /dev/null | sed 1d | cut -b3- | eval (__fzfcmd) +m > $TMPDIR/fzf.result
+    eval "$FZF_ALT_C_COMMAND | "(__fzfcmd)" +m > $TMPDIR/fzf.result"
    [ (cat $TMPDIR/fzf.result | wc -l) -gt 0 ]
    and cd (cat $TMPDIR/fzf.result)
    commandline -f repaint
--- a/shell/key-bindings.zsh
+++ b/shell/key-bindings.zsh
@@ -4,7 +4,7 @@ if [[ $- == *i* ]]; then

 # CTRL-T - Paste the selected file path(s) into the command line
 __fsel() {
-  local cmd="${FZF_CTRL_T_COMMAND:-"command \\find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
+  local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
    -o -type f -print \
    -o -type d -print \
    -o -type l -print 2> /dev/null | sed 1d | cut -b3-"}"
@@ -27,8 +27,9 @@ bindkey '^T' fzf-file-widget

 # ALT-C - cd into the selected directory
 fzf-cd-widget() {
-  cd "${$(command \find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
-    -o -type d -print 2> /dev/null | sed 1d | cut -b3- | $(__fzfcmd) +m):-.}"
+  local cmd="${FZF_ALT_C_COMMAND:-"command find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
+    -o -type d -print 2> /dev/null | sed 1d | cut -b3-"}"
+  cd "${$(eval "$cmd" | $(__fzfcmd) +m):-.}"
  zle reset-prompt
 }
 zle     -N    fzf-cd-widget
@@ -36,8 +37,9 @@ bindkey '\ec' fzf-cd-widget

 # CTRL-R - Paste the selected command from history into the command line
 fzf-history-widget() {
-  local selected restore_no_bang_hist
-  if selected=( $(fc -l 1 | $(__fzfcmd) +s --tac +m -n2..,.. --tiebreak=index --toggle-sort=ctrl-r -q "$LBUFFER") ); then
+  local selected num
+  selected=( $(fc -l 1 | $(__fzfcmd) +s --tac +m -n2..,.. --tiebreak=index --toggle-sort=ctrl-r -q "${LBUFFER//$/\\$}") )
+  if [ -n "$selected" ]; then
    num=$selected[1]
    if [ -n "$num" ]; then
      zle vi-fetch-history -n $num
--- a/src/Dockerfile.android
+++ b/src/Dockerfile.android
@@ -0,0 +1,44 @@
+FROM ubuntu:14.04
+MAINTAINER Junegunn Choi <junegunn.c@gmail.com>
+
+# apt-get
+RUN apt-get update && apt-get -y upgrade && \
+    apt-get install -y --force-yes git curl build-essential
+
+# Install Go 1.4
+RUN cd / && curl \
+    https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | \
+    tar -xz && mv go go1.4 && \
+    sed -i 's@#define PTHREAD_KEYS_MAX 128@@' /go1.4/src/runtime/cgo/gcc_android_arm.c
+
+ENV GOPATH /go
+ENV GOROOT /go1.4
+ENV PATH /go1.4/bin:$PATH
+
+RUN cd / && \
+    curl -O http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin && \
+    chmod 755 /android-ndk* && /android-ndk-r10e-linux-x86_64.bin && \
+    mv android-ndk-r10e /android-ndk
+
+RUN cd /android-ndk && bash ./build/tools/make-standalone-toolchain.sh --platform=android-21 --install-dir=/ndk --arch=arm
+
+ENV NDK_CC /ndk/bin/arm-linux-androideabi-gcc
+
+RUN cd $GOROOT/src && \
+    CC_FOR_TARGET=$NDK_CC GOOS=android GOARCH=arm GOARM=7 ./make.bash
+
+RUN cd / && curl \
+    http://ftp.gnu.org/gnu/ncurses/ncurses-5.9.tar.gz | \
+    tar -xz && cd /ncurses-5.9 && \
+    ./configure CC=$NDK_CC CFLAGS="-fPIE -march=armv7-a -mfpu=neon -mhard-float -Wl,--no-warn-mismatch" LDFLAGS="-march=armv7-a -Wl,--no-warn-mismatch" --host=arm-linux --enable-overwrite --enable-const --without-cxx-binding  --without-shared --without-debug --enable-widec --enable-ext-colors --enable-ext-mouse --enable-pc-files --with-pkg-config-libdir=$PKG_CONFIG_LIBDIR --without-manpages --without-ada --disable-shared --without-tests --prefix=/ndk/sysroot/usr --with-default-terminfo-dirs=/usr/share/terminfo --with-terminfo-dirs=/usr/share/terminfo ac_cv_header_locale_h=n ac_cv_func_getpwent=no ac_cv_func_getpwnam=no ac_cv_func_getpwuid=no && \
+    sed -i 's@#define HAVE_LOCALE_H 1@/* #undef HAVE_LOCALE_H */@' include/ncurses_cfg.h && \
+    make && \
+    sed -i '0,/echo.*/{s/echo.*/exit 0/}' misc/run_tic.sh && \
+    make install && \
+    mv /ndk/sysroot/usr/lib/libncursesw.a /ndk/sysroot/usr/lib/libncurses.a
+
+# Volume
+VOLUME /go
+
+# Default CMD
+CMD cd /go/src/github.com/junegunn/fzf/src && /bin/bash
--- a/src/Dockerfile.centos
+++ b/src/Dockerfile.centos
@@ -11,9 +11,15 @@ RUN cd / && curl \
    https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | \
    tar -xz && mv go go1.4

+# Install Go 1.5
+RUN cd / && curl \
+    https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz | \
+    tar -xz && mv go go1.5
+
+ENV GOROOT_BOOTSTRAP /go1.4
+ENV GOROOT /go1.5
 ENV GOPATH /go
-ENV GOROOT /go1.4
-ENV PATH /go1.4/bin:$PATH
+ENV PATH /go1.5/bin:$PATH

 # For i386 build
 RUN cd $GOROOT/src && GOARCH=386 ./make.bash
--- a/src/LICENSE
+++ b/src/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015 Junegunn Choi
+Copyright (c) 2016 Junegunn Choi

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,12 +2,14 @@ ifndef GOPATH
 $(error GOPATH is undefined)
 endif

+ifndef GOOS
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
 	GOOS := darwin
 else ifeq ($(UNAME_S),Linux)
 	GOOS := linux
 endif
+endif

 ifneq ($(shell uname -m),x86_64)
 $(error "Build on $(UNAME_M) is not supported, yet.")
@@ -18,9 +20,11 @@ BINDIR    := ../bin

 BINARY32    := fzf-$(GOOS)_386
 BINARY64    := fzf-$(GOOS)_amd64
-VERSION    = $(shell fzf/$(BINARY64) --version)
+BINARYARM7  := fzf-$(GOOS)_arm7
+VERSION     := $(shell awk -F= '/version =/ {print $$2}' constants.go | tr -d "\" ")
 RELEASE32   = fzf-$(VERSION)-$(GOOS)_386
 RELEASE64   = fzf-$(VERSION)-$(GOOS)_amd64
+RELEASEARM7 = fzf-$(VERSION)-$(GOOS)_arm7

 all: release

@@ -31,9 +35,14 @@ release: build

 build: test fzf/$(BINARY32) fzf/$(BINARY64)

+android-build:
+	cd fzf && GOARCH=arm GOARM=7 CGO_ENABLED=1 go build -a -ldflags="-extldflags=-pie" -o $(BINARYARM7)
+	cd fzf && cp $(BINARYARM7) $(RELEASEARM7) && tar -czf $(RELEASEARM7).tgz $(RELEASEARM7) && \
+	rm -f $(RELEASEARM7)
+
 test:
 	go get
-	go test -v ./...
+	SHELL=/bin/sh go test -v ./...

 install: $(BINDIR)/fzf

@@ -65,6 +74,9 @@ docker-ubuntu:
 docker-centos:
 	docker build -t junegunn/centos-sandbox - < Dockerfile.centos

+docker-android:
+	docker build -t junegunn/android-sandbox - < Dockerfile.android
+
 arch: docker-arch
 	docker run -i -t -v $(GOPATH):/go junegunn/$@-sandbox \
 		sh -c 'cd /go/src/github.com/junegunn/fzf/src; /bin/bash'
@@ -81,5 +93,14 @@ linux: docker-centos
 	docker run -i -t -v $(GOPATH):/go junegunn/centos-sandbox \
 		/bin/bash -ci 'cd /go/src/github.com/junegunn/fzf/src; make TAGS=static'

+ubuntu-android: docker-android
+	docker run -i -t -v $(GOPATH):/go junegunn/android-sandbox \
+		sh -c 'cd /go/src/github.com/junegunn/fzf/src; /bin/bash'
+
+android: docker-android
+	docker run -i -t -v $(GOPATH):/go junegunn/android-sandbox \
+		/bin/bash -ci 'cd /go/src/github.com/junegunn/fzf/src; GOOS=android make android-build'
+
 .PHONY: all build release test install uninstall clean docker \
-	linux arch ubuntu centos docker-arch docker-ubuntu docker-centos
+	linux arch ubuntu centos docker-arch docker-ubuntu docker-centos \
+	android-build docker-android ubuntu-android android
--- a/src/chunklist_test.go
+++ b/src/chunklist_test.go
@@ -6,8 +6,11 @@ import (
 )

 func TestChunkList(t *testing.T) {
+	// FIXME global
+	sortCriteria = []criterion{byMatchLen, byLength}
+
 	cl := NewChunkList(func(s []byte, i int) *Item {
-		return &Item{text: []rune(string(s)), rank: Rank{0, 0, uint32(i * 2)}}
+		return &Item{text: []rune(string(s)), rank: buildEmptyRank(int32(i * 2))}
 	})

 	// Snapshot
@@ -36,8 +39,11 @@ func TestChunkList(t *testing.T) {
 	if len(*chunk1) != 2 {
 		t.Error("Snapshot should contain only two items")
 	}
-	if string((*chunk1)[0].text) != "hello" || (*chunk1)[0].rank.index != 0 ||
-		string((*chunk1)[1].text) != "world" || (*chunk1)[1].rank.index != 2 {
+	last := func(arr [5]int32) int32 {
+		return arr[len(arr)-1]
+	}
+	if string((*chunk1)[0].text) != "hello" || last((*chunk1)[0].rank) != 0 ||
+		string((*chunk1)[1].text) != "world" || last((*chunk1)[1].rank) != 2 {
 		t.Error("Invalid data")
 	}
 	if chunk1.IsFull() {
--- a/src/constants.go
+++ b/src/constants.go
@@ -8,7 +8,7 @@ import (

 const (
 	// Current version
-	version = "0.10.7"
+	version = "0.11.3"

 	// Core
 	coordinatorDelayMax  time.Duration = 100 * time.Millisecond
@@ -18,7 +18,8 @@ const (
 	defaultCommand = `find . -path '*/\.*' -prune -o -type f -print -o -type l -print 2> /dev/null | sed s/^..//`

 	// Terminal
-	initialDelay    = 100 * time.Millisecond
+	initialDelay    = 20 * time.Millisecond
+	initialDelayTac = 100 * time.Millisecond
 	spinnerDuration = 200 * time.Millisecond

 	// Matcher
--- a/src/core.go
+++ b/src/core.go
@@ -3,7 +3,7 @@ Package fzf implements fzf, a command-line fuzzy finder.

 The MIT License (MIT)

-Copyright (c) 2015 Junegunn Choi
+Copyright (c) 2016 Junegunn Choi

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ func Run(opts *Options) {
 	initProcs()

 	sort := opts.Sort > 0
-	rankTiebreak = opts.Tiebreak
+	sortCriteria = opts.Criteria

 	if opts.Version {
 		fmt.Println(version)
@@ -103,9 +103,8 @@ func Run(opts *Options) {
 			runes, colors := ansiProcessor(data)
 			return &Item{
 				text:   runes,
-				index:  uint32(index),
 				colors: colors,
-				rank:   Rank{0, 0, uint32(index)}}
+				rank:   buildEmptyRank(int32(index))}
 		})
 	} else {
 		chunkList = NewChunkList(func(data []byte, index int) *Item {
@@ -120,9 +119,8 @@ func Run(opts *Options) {
 			item := Item{
 				text:     joinTokens(trans),
 				origText: &runes,
-				index:    uint32(index),
 				colors:   nil,
-				rank:     Rank{0, 0, uint32(index)}}
+				rank:     buildEmptyRank(int32(index))}

 			trimmed, colors := ansiProcessorRunes(item.text)
 			item.text = trimmed
@@ -141,9 +139,19 @@ func Run(opts *Options) {
 	}

 	// Matcher
+	forward := true
+	for _, cri := range opts.Criteria[1:] {
+		if cri == byEnd {
+			forward = false
+			break
+		}
+		if cri == byBegin {
+			break
+		}
+	}
 	patternBuilder := func(runes []rune) *Pattern {
 		return BuildPattern(
-			opts.Mode, opts.Case, opts.Tiebreak != byEnd,
+			opts.Fuzzy, opts.Extended, opts.Case, forward,
 			opts.Nth, opts.Delimiter, runes)
 	}
 	matcher := NewMatcher(patternBuilder, sort, opts.Tac, eventBox)
--- a/src/curses/curses.go
+++ b/src/curses/curses.go
@@ -4,13 +4,20 @@ package curses
 #include <ncurses.h>
 #include <locale.h>
 #cgo !static LDFLAGS: -lncurses
-#cgo static LDFLAGS: -l:libncurses.a -l:libtinfo.a -l:libgpm.a -ldl
+#cgo static LDFLAGS: -l:libncursesw.a -l:libtinfo.a -l:libgpm.a -ldl
+#cgo android static LDFLAGS: -l:libncurses.a -fPIE -march=armv7-a -mfpu=neon -mhard-float -Wl,--no-warn-mismatch
+
+SCREEN *c_newterm () {
+	return newterm(NULL, stderr, stdin);
+}
+
 */
 import "C"

 import (
 	"fmt"
 	"os"
+	"strings"
 	"syscall"
 	"time"
 	"unicode/utf8"
@@ -50,6 +57,7 @@ const (

 	Invalid
 	Mouse
+	DoubleClick

 	BTab
 	BSpace
@@ -258,7 +266,7 @@ func Init(theme *ColorTheme, black bool, mouse bool) {
 	}

 	C.setlocale(C.LC_ALL, C.CString(""))
-	_screen = C.newterm(nil, C.stderr, C.stdin)
+	_screen = C.c_newterm()
 	if _screen == nil {
 		fmt.Println("Invalid $TERM: " + os.Getenv("TERM"))
 		os.Exit(2)
@@ -513,7 +521,12 @@ func MoveAndClear(y int, x int) {
 }

 func Print(text string) {
-	C.addstr(C.CString(text))
+	C.addstr(C.CString(strings.Map(func(r rune) rune {
+		if r < 32 {
+			return -1
+		}
+		return r
+	}, text)))
 }

 func CPrint(pair int, bold bool, text string) {
--- a/src/item.go
+++ b/src/item.go
@@ -20,31 +20,41 @@ type Item struct {
 	text        []rune
 	origText    *[]rune
 	transformed []Token
-	index       uint32
 	offsets     []Offset
 	colors      []ansiOffset
-	rank        Rank
+	rank        [5]int32
 }

-// Rank is used to sort the search result
-type Rank struct {
-	matchlen uint16
-	tiebreak uint16
-	index    uint32
+// Sort criteria to use. Never changes once fzf is started.
+var sortCriteria []criterion
+
+func isRankValid(rank [5]int32) bool {
+	// Exclude ordinal index
+	for _, r := range rank[:4] {
+		if r > 0 {
+			return true
+		}
+	}
+	return false
 }

-// Tiebreak criterion to use. Never changes once fzf is started.
-var rankTiebreak tiebreak
+func buildEmptyRank(index int32) [5]int32 {
+	return [5]int32{0, 0, 0, 0, index}
+}
+
+func (item *Item) Index() int32 {
+	return item.rank[4]
+}

 // Rank calculates rank of the Item
-func (item *Item) Rank(cache bool) Rank {
-	if cache && (item.rank.matchlen > 0 || item.rank.tiebreak > 0) {
+func (item *Item) Rank(cache bool) [5]int32 {
+	if cache && isRankValid(item.rank) {
 		return item.rank
 	}
 	matchlen := 0
 	prevEnd := 0
 	lenSum := 0
-	minBegin := math.MaxUint16
+	minBegin := math.MaxInt32
 	for _, offset := range item.offsets {
 		begin := int(offset[0])
 		end := int(offset[1])
@@ -63,30 +73,43 @@ func (item *Item) Rank(cache bool) Rank {
 			matchlen += end - begin
 		}
 	}
-	var tiebreak uint16
-	switch rankTiebreak {
+	if matchlen == 0 {
+		matchlen = math.MaxInt32
+	}
+	rank := buildEmptyRank(item.Index())
+	for idx, criterion := range sortCriteria {
+		var val int32
+		switch criterion {
+		case byMatchLen:
+			val = int32(matchlen)
 		case byLength:
 			// It is guaranteed that .transformed in not null in normal execution
 			if item.transformed != nil {
 				// If offsets is empty, lenSum will be 0, but we don't care
-			tiebreak = uint16(lenSum)
+				val = int32(lenSum)
 			} else {
-			tiebreak = uint16(len(item.text))
+				val = int32(len(item.text))
 			}
 		case byBegin:
 			// We can't just look at item.offsets[0][0] because it can be an inverse term
-		tiebreak = uint16(minBegin)
+			whitePrefixLen := 0
+			for idx, r := range item.text {
+				whitePrefixLen = idx
+				if idx == minBegin || r != ' ' && r != '\t' {
+					break
+				}
+			}
+			val = int32(minBegin - whitePrefixLen)
 		case byEnd:
 			if prevEnd > 0 {
-			tiebreak = uint16(1 + len(item.text) - prevEnd)
+				val = int32(1 + len(item.text) - prevEnd)
 			} else {
 				// Empty offsets due to inverse terms.
-			tiebreak = 1
+				val = 1
 			}
-	case byIndex:
-		tiebreak = 1
 		}
-	rank := Rank{uint16(matchlen), tiebreak, item.index}
+		rank[idx] = val
+	}
 	if cache {
 		item.rank = rank
 	}
@@ -251,18 +274,15 @@ func (a ByRelevanceTac) Less(i, j int) bool {
 	return compareRanks(irank, jrank, true)
 }

-func compareRanks(irank Rank, jrank Rank, tac bool) bool {
-	if irank.matchlen < jrank.matchlen {
+func compareRanks(irank [5]int32, jrank [5]int32, tac bool) bool {
+	for idx := 0; idx < 4; idx++ {
+		left := irank[idx]
+		right := jrank[idx]
+		if left < right {
 			return true
-	} else if irank.matchlen > jrank.matchlen {
+		} else if left > right {
 			return false
 		}
-
-	if irank.tiebreak < jrank.tiebreak {
-		return true
-	} else if irank.tiebreak > jrank.tiebreak {
-		return false
 	}
-
-	return (irank.index <= jrank.index) != tac
+	return (irank[4] <= jrank[4]) != tac
 }
--- a/src/item_test.go
+++ b/src/item_test.go
@@ -1,6 +1,7 @@
 package fzf

 import (
+	"math"
 	"sort"
 	"testing"

@@ -22,31 +23,34 @@ func TestOffsetSort(t *testing.T) {
 }

 func TestRankComparison(t *testing.T) {
-	if compareRanks(Rank{3, 0, 5}, Rank{2, 0, 7}, false) ||
-		!compareRanks(Rank{3, 0, 5}, Rank{3, 0, 6}, false) ||
-		!compareRanks(Rank{1, 2, 3}, Rank{1, 3, 2}, false) ||
-		!compareRanks(Rank{0, 0, 0}, Rank{0, 0, 0}, false) {
+	if compareRanks([5]int32{3, 0, 0, 0, 5}, [5]int32{2, 0, 0, 0, 7}, false) ||
+		!compareRanks([5]int32{3, 0, 0, 0, 5}, [5]int32{3, 0, 0, 0, 6}, false) ||
+		!compareRanks([5]int32{1, 2, 0, 0, 3}, [5]int32{1, 3, 0, 0, 2}, false) ||
+		!compareRanks([5]int32{0, 0, 0, 0, 0}, [5]int32{0, 0, 0, 0, 0}, false) {
 		t.Error("Invalid order")
 	}

-	if compareRanks(Rank{3, 0, 5}, Rank{2, 0, 7}, true) ||
-		!compareRanks(Rank{3, 0, 5}, Rank{3, 0, 6}, false) ||
-		!compareRanks(Rank{1, 2, 3}, Rank{1, 3, 2}, true) ||
-		!compareRanks(Rank{0, 0, 0}, Rank{0, 0, 0}, false) {
+	if compareRanks([5]int32{3, 0, 0, 0, 5}, [5]int32{2, 0, 0, 0, 7}, true) ||
+		!compareRanks([5]int32{3, 0, 0, 0, 5}, [5]int32{3, 0, 0, 0, 6}, false) ||
+		!compareRanks([5]int32{1, 2, 0, 0, 3}, [5]int32{1, 3, 0, 0, 2}, true) ||
+		!compareRanks([5]int32{0, 0, 0, 0, 0}, [5]int32{0, 0, 0, 0, 0}, false) {
 		t.Error("Invalid order (tac)")
 	}
 }

 // Match length, string length, index
 func TestItemRank(t *testing.T) {
+	// FIXME global
+	sortCriteria = []criterion{byMatchLen, byLength}
+
 	strs := [][]rune{[]rune("foo"), []rune("foobar"), []rune("bar"), []rune("baz")}
-	item1 := Item{text: strs[0], index: 1, offsets: []Offset{}}
+	item1 := Item{text: strs[0], offsets: []Offset{}, rank: [5]int32{0, 0, 0, 0, 1}}
 	rank1 := item1.Rank(true)
-	if rank1.matchlen != 0 || rank1.tiebreak != 3 || rank1.index != 1 {
+	if rank1[0] != math.MaxInt32 || rank1[1] != 3 || rank1[4] != 1 {
 		t.Error(item1.Rank(true))
 	}
 	// Only differ in index
-	item2 := Item{text: strs[0], index: 0, offsets: []Offset{}}
+	item2 := Item{text: strs[0], offsets: []Offset{}}

 	items := []*Item{&item1, &item2}
 	sort.Sort(ByRelevance(items))
@@ -62,15 +66,15 @@ func TestItemRank(t *testing.T) {
 	}

 	// Sort by relevance
-	item3 := Item{text: strs[1], rank: Rank{0, 0, 2}, offsets: []Offset{Offset{1, 3}, Offset{5, 7}}}
-	item4 := Item{text: strs[1], rank: Rank{0, 0, 2}, offsets: []Offset{Offset{1, 2}, Offset{6, 7}}}
-	item5 := Item{text: strs[2], rank: Rank{0, 0, 2}, offsets: []Offset{Offset{1, 3}, Offset{5, 7}}}
-	item6 := Item{text: strs[2], rank: Rank{0, 0, 2}, offsets: []Offset{Offset{1, 2}, Offset{6, 7}}}
+	item3 := Item{text: strs[1], rank: [5]int32{0, 0, 0, 0, 2}, offsets: []Offset{Offset{1, 3}, Offset{5, 7}}}
+	item4 := Item{text: strs[1], rank: [5]int32{0, 0, 0, 0, 2}, offsets: []Offset{Offset{1, 2}, Offset{6, 7}}}
+	item5 := Item{text: strs[2], rank: [5]int32{0, 0, 0, 0, 2}, offsets: []Offset{Offset{1, 3}, Offset{5, 7}}}
+	item6 := Item{text: strs[2], rank: [5]int32{0, 0, 0, 0, 2}, offsets: []Offset{Offset{1, 2}, Offset{6, 7}}}
 	items = []*Item{&item1, &item2, &item3, &item4, &item5, &item6}
 	sort.Sort(ByRelevance(items))
-	if items[0] != &item2 || items[1] != &item1 ||
-		items[2] != &item6 || items[3] != &item4 ||
-		items[4] != &item5 || items[5] != &item3 {
+	if items[0] != &item6 || items[1] != &item4 ||
+		items[2] != &item5 || items[3] != &item3 ||
+		items[4] != &item2 || items[5] != &item1 {
 		t.Error(items)
 	}
 }
--- a/src/merger.go
+++ b/src/merger.go
@@ -88,7 +88,7 @@ func (mg *Merger) cacheable() bool {

 func (mg *Merger) mergedGet(idx int) *Item {
 	for i := len(mg.merged); i <= idx; i++ {
-		minRank := Rank{0, 0, 0}
+		minRank := buildEmptyRank(0)
 		minIdx := -1
 		for listIdx, list := range mg.lists {
 			cursor := mg.cursors[listIdx]
--- a/src/merger_test.go
+++ b/src/merger_test.go
@@ -23,7 +23,7 @@ func randItem() *Item {
 	}
 	return &Item{
 		text:    []rune(str),
-		index:   rand.Uint32(),
+		rank:    buildEmptyRank(rand.Int31()),
 		offsets: offsets}
 }

--- a/src/options.go
+++ b/src/options.go
@@ -16,17 +16,19 @@ const usage = `usage: fzf [options]

  Search
    -x, --extended        Extended-search mode
-    -e, --extended-exact  Extended-search mode (exact match)
+                          (enabled by default; +x or --no-extended to disable)
+    -e, --exact           Enable Exact-match
    -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])
+                          integer or a range expression ([BEGIN]..[END]).
    --with-nth=N[,..]     Transform item using index expressions within finder
    -d, --delimiter=STR   Field delimiter regex for --nth (default: AWK-style)
    +s, --no-sort         Do not sort the result
    --tac                 Reverse the order of the input
-    --tiebreak=CRITERION  Sort criterion when the scores are tied;
+    --tiebreak=CRI[,..]   Comma-separated list of sort criteria to apply
+                          when the scores are tied;
                          [length|begin|end|index] (default: length)

  Interface
@@ -37,6 +39,7 @@ const usage = `usage: fzf [options]
    --black               Use black background
    --reverse             Reverse orientation
    --margin=MARGIN       Screen margin (TRBL / TB,RL / T,RL,B / T,R,B,L)
+    --tabstop=SPACES      Number of spaces for a tab character (default: 8)
    --cycle               Enable cyclic scroll
    --no-hscroll          Disable horizontal scroll
    --inline-info         Display finder info inline with the query
@@ -58,20 +61,10 @@ const usage = `usage: fzf [options]

  Environment variables
    FZF_DEFAULT_COMMAND   Default command to use when input is tty
-    FZF_DEFAULT_OPTS      Defaults options. (e.g. '-x -m')
+    FZF_DEFAULT_OPTS      Default options (e.g. '--reverse --inline-info')

 `

-// Mode denotes the current search mode
-type Mode int
-
-// Search modes
-const (
-	ModeFuzzy Mode = iota
-	ModeExtended
-	ModeExtendedExact
-)
-
 // Case denotes case-sensitivity of search
 type Case int

@@ -83,13 +76,13 @@ const (
 )

 // Sort criteria
-type tiebreak int
+type criterion int

 const (
-	byLength tiebreak = iota
+	byMatchLen criterion = iota
+	byLength
 	byBegin
 	byEnd
-	byIndex
 )

 func defaultMargin() [4]string {
@@ -98,14 +91,15 @@ func defaultMargin() [4]string {

 // Options stores the values of command-line options
 type Options struct {
-	Mode        Mode
+	Fuzzy       bool
+	Extended    bool
 	Case        Case
 	Nth         []Range
 	WithNth     []Range
 	Delimiter   Delimiter
 	Sort        int
 	Tac         bool
-	Tiebreak    tiebreak
+	Criteria    []criterion
 	Multi       bool
 	Ansi        bool
 	Mouse       bool
@@ -131,6 +125,7 @@ type Options struct {
 	Header      []string
 	HeaderLines int
 	Margin      [4]string
+	Tabstop     int
 	Version     bool
 }

@@ -143,14 +138,15 @@ func defaultTheme() *curses.ColorTheme {

 func defaultOptions() *Options {
 	return &Options{
-		Mode:        ModeFuzzy,
+		Fuzzy:       true,
+		Extended:    true,
 		Case:        CaseSmart,
 		Nth:         make([]Range, 0),
 		WithNth:     make([]Range, 0),
 		Delimiter:   Delimiter{},
 		Sort:        1000,
 		Tac:         false,
-		Tiebreak:    byLength,
+		Criteria:    []criterion{byMatchLen, byLength},
 		Multi:       false,
 		Ansi:        false,
 		Mouse:       true,
@@ -176,6 +172,7 @@ func defaultOptions() *Options {
 		Header:      make([]string, 0),
 		HeaderLines: 0,
 		Margin:      defaultMargin(),
+		Tabstop:     8,
 		Version:     false}
 }

@@ -343,6 +340,8 @@ func parseKeyChords(str string, message string) map[int]string {
 			chord = curses.SLeft
 		case "shift-right":
 			chord = curses.SRight
+		case "double-click":
+			chord = curses.DoubleClick
 		default:
 			if len(key) == 6 && strings.HasPrefix(lkey, "ctrl-") && isAlphabet(lkey[5]) {
 				chord = curses.CtrlA + int(lkey[5]) - 'a'
@@ -363,26 +362,48 @@ func parseKeyChords(str string, message string) map[int]string {
 	return chords
 }

-func parseTiebreak(str string) tiebreak {
-	switch strings.ToLower(str) {
-	case "length":
-		return byLength
+func parseTiebreak(str string) []criterion {
+	criteria := []criterion{byMatchLen}
+	hasIndex := false
+	hasLength := false
+	hasBegin := false
+	hasEnd := false
+	check := func(notExpected *bool, name string) {
+		if *notExpected {
+			errorExit("duplicate sort criteria: " + name)
+		}
+		if hasIndex {
+			errorExit("index should be the last criterion")
+		}
+		*notExpected = true
+	}
+	for _, str := range strings.Split(strings.ToLower(str), ",") {
+		switch str {
 		case "index":
-		return byIndex
+			check(&hasIndex, "index")
+		case "length":
+			check(&hasLength, "length")
+			criteria = append(criteria, byLength)
 		case "begin":
-		return byBegin
+			check(&hasBegin, "begin")
+			criteria = append(criteria, byBegin)
 		case "end":
-		return byEnd
+			check(&hasEnd, "end")
+			criteria = append(criteria, byEnd)
 		default:
 			errorExit("invalid sort criterion: " + str)
 		}
-	return byLength
+	}
+	return criteria
 }

 func dupeTheme(theme *curses.ColorTheme) *curses.ColorTheme {
+	if theme != nil {
 		dupe := *theme
 		return &dupe
 	}
+	return nil
+}

 func parseTheme(defaultTheme *curses.ColorTheme, str string) *curses.ColorTheme {
 	theme := dupeTheme(defaultTheme)
@@ -402,7 +423,7 @@ func parseTheme(defaultTheme *curses.ColorTheme, str string) *curses.ColorTheme
 			}
 			// Color is disabled
 			if theme == nil {
-				errorExit("colors disabled; cannot customize colors")
+				continue
 			}

 			pair := strings.Split(str, ":")
@@ -468,10 +489,13 @@ func parseKeymap(keymap map[int]actionType, execmap map[int]string, toggleSort b
 		// Backreferences are not supported.
 		// "~!@#$%^&*;/|".each_char.map { |c| Regexp.escape(c) }.map { |c| "#{c}[^#{c}]*#{c}" }.join('|')
 		executeRegexp = regexp.MustCompile(
-			"(?s):execute:.*|:execute(\\([^)]*\\)|\\[[^\\]]*\\]|~[^~]*~|![^!]*!|@[^@]*@|\\#[^\\#]*\\#|\\$[^\\$]*\\$|%[^%]*%|\\^[^\\^]*\\^|&[^&]*&|\\*[^\\*]*\\*|;[^;]*;|/[^/]*/|\\|[^\\|]*\\|)")
+			"(?s):execute(-multi)?:.*|:execute(-multi)?(\\([^)]*\\)|\\[[^\\]]*\\]|~[^~]*~|![^!]*!|@[^@]*@|\\#[^\\#]*\\#|\\$[^\\$]*\\$|%[^%]*%|\\^[^\\^]*\\^|&[^&]*&|\\*[^\\*]*\\*|;[^;]*;|/[^/]*/|\\|[^\\|]*\\|)")
 	}
 	masked := executeRegexp.ReplaceAllStringFunc(str, func(src string) string {
-		return ":execute(" + strings.Repeat(" ", len(src)-10) + ")"
+		if strings.HasPrefix(src, ":execute-multi") {
+			return ":execute-multi(" + strings.Repeat(" ", len(src)-len(":execute-multi()")) + ")"
+		}
+		return ":execute(" + strings.Repeat(" ", len(src)-len(":execute()")) + ")"
 	})
 	masked = strings.Replace(masked, "::", string([]rune{escapedColon, ':'}), -1)
 	masked = strings.Replace(masked, ",:", string([]rune{escapedComma, ':'}), -1)
@@ -542,6 +566,10 @@ func parseKeymap(keymap map[int]actionType, execmap map[int]string, toggleSort b
 			keymap[key] = actToggleDown
 		case "toggle-up":
 			keymap[key] = actToggleUp
+		case "toggle-in":
+			keymap[key] = actToggleIn
+		case "toggle-out":
+			keymap[key] = actToggleOut
 		case "toggle-all":
 			keymap[key] = actToggleAll
 		case "select-all":
@@ -567,11 +595,18 @@ func parseKeymap(keymap map[int]actionType, execmap map[int]string, toggleSort b
 			toggleSort = true
 		default:
 			if isExecuteAction(actLower) {
-				keymap[key] = actExecute
-				if act[7] == ':' {
-					execmap[key] = act[8:]
+				var offset int
+				if strings.HasPrefix(actLower, "execute-multi") {
+					keymap[key] = actExecuteMulti
+					offset = len("execute-multi")
 				} else {
-					execmap[key] = act[8 : len(act)-1]
+					keymap[key] = actExecute
+					offset = len("execute")
+				}
+				if act[offset] == ':' {
+					execmap[key] = act[offset+1:]
+				} else {
+					execmap[key] = act[offset+1 : len(act)-1]
 				}
 			} else {
 				errorExit("unknown action: " + act)
@@ -582,10 +617,16 @@ func parseKeymap(keymap map[int]actionType, execmap map[int]string, toggleSort b
 }

 func isExecuteAction(str string) bool {
-	if !strings.HasPrefix(str, "execute") || len(str) < 9 {
+	if !strings.HasPrefix(str, "execute") || len(str) < len("execute()") {
 		return false
 	}
-	b := str[7]
+	b := str[len("execute")]
+	if strings.HasPrefix(str, "execute-multi") {
+		if len(str) < len("execute-multi()") {
+			return false
+		}
+		b = str[len("execute-multi")]
+	}
 	e := str[len(str)-1]
 	if b == ':' || b == '(' && e == ')' || b == '[' && e == ']' ||
 		b == e && strings.ContainsAny(string(b), "~!@#$%^&*;/|") {
@@ -679,11 +720,17 @@ func parseOptions(opts *Options, allArgs []string) {
 		case "-h", "--help":
 			help(exitOk)
 		case "-x", "--extended":
-			opts.Mode = ModeExtended
-		case "-e", "--extended-exact":
-			opts.Mode = ModeExtendedExact
-		case "+x", "--no-extended", "+e", "--no-extended-exact":
-			opts.Mode = ModeFuzzy
+			opts.Extended = true
+		case "-e", "--exact":
+			opts.Fuzzy = false
+		case "--extended-exact":
+			// Note that we now don't have --no-extended-exact
+			opts.Fuzzy = false
+			opts.Extended = true
+		case "+x", "--no-extended":
+			opts.Extended = false
+		case "+e", "--no-exact":
+			opts.Fuzzy = true
 		case "-q", "--query":
 			opts.Query = nextString(allArgs, &i, "query string required")
 		case "-f", "--filter":
@@ -692,7 +739,7 @@ func parseOptions(opts *Options, allArgs []string) {
 		case "--expect":
 			opts.Expect = parseKeyChords(nextString(allArgs, &i, "key names required"), "key names required")
 		case "--tiebreak":
-			opts.Tiebreak = parseTiebreak(nextString(allArgs, &i, "sort criterion required"))
+			opts.Criteria = parseTiebreak(nextString(allArgs, &i, "sort criterion required"))
 		case "--bind":
 			keymap, opts.Execmap, opts.ToggleSort =
 				parseKeymap(keymap, opts.Execmap, opts.ToggleSort, nextString(allArgs, &i, "bind expression required"))
@@ -802,6 +849,8 @@ func parseOptions(opts *Options, allArgs []string) {
 		case "--margin":
 			opts.Margin = parseMargin(
 				nextString(allArgs, &i, "margin required (TRBL / TB,RL / T,RL,B / T,R,B,L)"))
+		case "--tabstop":
+			opts.Tabstop = nextInt(allArgs, &i, "tab stop required")
 		case "--version":
 			opts.Version = true
 		default:
@@ -825,7 +874,7 @@ func parseOptions(opts *Options, allArgs []string) {
 			} else if match, value := optString(arg, "--expect="); match {
 				opts.Expect = parseKeyChords(value, "key names required")
 			} else if match, value := optString(arg, "--tiebreak="); match {
-				opts.Tiebreak = parseTiebreak(value)
+				opts.Criteria = parseTiebreak(value)
 			} else if match, value := optString(arg, "--color="); match {
 				opts.Theme = parseTheme(opts.Theme, value)
 			} else if match, value := optString(arg, "--bind="); match {
@@ -841,6 +890,8 @@ func parseOptions(opts *Options, allArgs []string) {
 				opts.HeaderLines = atoi(value)
 			} else if match, value := optString(arg, "--margin="); match {
 				opts.Margin = parseMargin(value)
+			} else if match, value := optString(arg, "--tabstop="); match {
+				opts.Tabstop = atoi(value)
 			} else {
 				errorExit("unknown option: " + arg)
 			}
@@ -851,6 +902,10 @@ func parseOptions(opts *Options, allArgs []string) {
 		errorExit("header lines must be a non-negative integer")
 	}

+	if opts.Tabstop < 1 {
+		errorExit("tab stop must be a positive integer")
+	}
+
 	// Change default actions for CTRL-N / CTRL-P when --history is used
 	if opts.History != nil {
 		if _, prs := keymap[curses.CtrlP]; !prs {
@@ -868,7 +923,7 @@ func parseOptions(opts *Options, allArgs []string) {

 	// If we're not using extended search mode, --nth option becomes irrelevant
 	// if it contains the whole range
-	if opts.Mode == ModeFuzzy || len(opts.Nth) == 1 {
+	if !opts.Extended || len(opts.Nth) == 1 {
 		for _, r := range opts.Nth {
 			if r.begin == rangeEllipsis && r.end == rangeEllipsis {
 				opts.Nth = make([]Range, 0)
--- a/src/options_test.go
+++ b/src/options_test.go
@@ -100,7 +100,7 @@ func TestIrrelevantNth(t *testing.T) {
 			t.Errorf("nth should be empty: %s", opts.Nth)
 		}
 	}
-	for _, words := range [][]string{[]string{"--nth", "..,3"}, []string{"--nth", "3,1.."}, []string{"--nth", "..-1,1"}} {
+	for _, words := range [][]string{[]string{"--nth", "..,3", "+x"}, []string{"--nth", "3,1..", "+x"}, []string{"--nth", "..-1,1", "+x"}} {
 		{
 			opts := defaultOptions()
 			parseOptions(opts, words)
@@ -316,3 +316,15 @@ func TestColorSpec(t *testing.T) {
 		t.Errorf("using default colors")
 	}
 }
+
+func TestParseNilTheme(t *testing.T) {
+	var theme *curses.ColorTheme
+	newTheme := parseTheme(theme, "prompt:12")
+	if newTheme != nil {
+		t.Errorf("color is disabled. keep it that way.")
+	}
+	newTheme = parseTheme(theme, "prompt:12,dark,prompt:13")
+	if newTheme.Prompt != 13 {
+		t.Errorf("color should now be enabled and customized")
+	}
+}
--- a/src/pattern.go
+++ b/src/pattern.go
@@ -36,14 +36,17 @@ type term struct {
 	origText      []rune
 }

+type termSet []term
+
 // Pattern represents search pattern
 type Pattern struct {
-	mode          Mode
+	fuzzy         bool
+	extended      bool
 	caseSensitive bool
 	forward       bool
 	text          []rune
-	terms         []term
-	hasInvTerm    bool
+	termSets      []termSet
+	cacheable     bool
 	delimiter     Delimiter
 	nth           []Range
 	procFun       map[termType]func(bool, bool, []rune, []rune) (int, int)
@@ -63,7 +66,7 @@ func init() {

 func clearPatternCache() {
 	// We can uniquely identify the pattern for a given string since
-	// mode and caseMode do not change while the program is running
+	// search mode and caseMode do not change while the program is running
 	_patternCache = make(map[string]*Pattern)
 }

@@ -72,14 +75,13 @@ func clearChunkCache() {
 }

 // BuildPattern builds Pattern object from the given arguments
-func BuildPattern(mode Mode, caseMode Case, forward bool,
+func BuildPattern(fuzzy bool, extended bool, caseMode Case, forward bool,
 	nth []Range, delimiter Delimiter, runes []rune) *Pattern {

 	var asString string
-	switch mode {
-	case ModeExtended, ModeExtendedExact:
+	if extended {
 		asString = strings.Trim(string(runes), " ")
-	default:
+	} else {
 		asString = string(runes)
 	}

@@ -88,18 +90,23 @@ func BuildPattern(mode Mode, caseMode Case, forward bool,
 		return cached
 	}

-	caseSensitive, hasInvTerm := true, false
-	terms := []term{}
+	caseSensitive, cacheable := true, true
+	termSets := []termSet{}

-	switch mode {
-	case ModeExtended, ModeExtendedExact:
-		terms = parseTerms(mode, caseMode, asString)
-		for _, term := range terms {
-			if term.inv {
-				hasInvTerm = true
+	if extended {
+		termSets = parseTerms(fuzzy, caseMode, asString)
+	Loop:
+		for _, termSet := range termSets {
+			for idx, term := range termSet {
+				// If the query contains inverse search terms or OR operators,
+				// we cannot cache the search scope
+				if idx > 0 || term.inv {
+					cacheable = false
+					break Loop
 				}
 			}
-	default:
+		}
+	} else {
 		lowerString := strings.ToLower(asString)
 		caseSensitive = caseMode == CaseRespect ||
 			caseMode == CaseSmart && lowerString != asString
@@ -109,12 +116,13 @@ func BuildPattern(mode Mode, caseMode Case, forward bool,
 	}

 	ptr := &Pattern{
-		mode:          mode,
+		fuzzy:         fuzzy,
+		extended:      extended,
 		caseSensitive: caseSensitive,
 		forward:       forward,
 		text:          []rune(asString),
-		terms:         terms,
-		hasInvTerm:    hasInvTerm,
+		termSets:      termSets,
+		cacheable:     cacheable,
 		nth:           nth,
 		delimiter:     delimiter,
 		procFun:       make(map[termType]func(bool, bool, []rune, []rune) (int, int))}
@@ -129,9 +137,11 @@ func BuildPattern(mode Mode, caseMode Case, forward bool,
 	return ptr
 }

-func parseTerms(mode Mode, caseMode Case, str string) []term {
+func parseTerms(fuzzy bool, caseMode Case, str string) []termSet {
 	tokens := _splitRegex.Split(str, -1)
-	terms := []term{}
+	sets := []termSet{}
+	set := termSet{}
+	switchSet := false
 	for _, token := range tokens {
 		typ, inv, text := termFuzzy, false, token
 		lowerText := strings.ToLower(text)
@@ -141,20 +151,26 @@ func parseTerms(mode Mode, caseMode Case, str string) []term {
 			text = lowerText
 		}
 		origText := []rune(text)
-		if mode == ModeExtendedExact {
+		if !fuzzy {
 			typ = termExact
 		}

+		if text == "|" {
+			switchSet = false
+			continue
+		}
+
 		if strings.HasPrefix(text, "!") {
 			inv = true
 			text = text[1:]
 		}

 		if strings.HasPrefix(text, "'") {
-			if mode == ModeExtended {
+			// Flip exactness
+			if fuzzy {
 				typ = termExact
 				text = text[1:]
-			} else if mode == ModeExtendedExact {
+			} else {
 				typ = termFuzzy
 				text = text[1:]
 			}
@@ -172,23 +188,31 @@ func parseTerms(mode Mode, caseMode Case, str string) []term {
 		}

 		if len(text) > 0 {
-			terms = append(terms, term{
+			if switchSet {
+				sets = append(sets, set)
+				set = termSet{}
+			}
+			set = append(set, term{
 				typ:           typ,
 				inv:           inv,
 				text:          []rune(text),
 				caseSensitive: caseSensitive,
 				origText:      origText})
+			switchSet = true
 		}
 	}
-	return terms
+	if len(set) > 0 {
+		sets = append(sets, set)
+	}
+	return sets
 }

 // IsEmpty returns true if the pattern is effectively empty
 func (p *Pattern) IsEmpty() bool {
-	if p.mode == ModeFuzzy {
+	if !p.extended {
 		return len(p.text) == 0
 	}
-	return len(p.terms) == 0
+	return len(p.termSets) == 0
 }

 // AsString returns the search query in string type
@@ -198,15 +222,14 @@ func (p *Pattern) AsString() string {

 // CacheKey is used to build string to be used as the key of result cache
 func (p *Pattern) CacheKey() string {
-	if p.mode == ModeFuzzy {
+	if !p.extended {
 		return p.AsString()
 	}
 	cacheableTerms := []string{}
-	for _, term := range p.terms {
-		if term.inv {
-			continue
+	for _, termSet := range p.termSets {
+		if len(termSet) == 1 && !termSet[0].inv {
+			cacheableTerms = append(cacheableTerms, string(termSet[0].origText))
 		}
-		cacheableTerms = append(cacheableTerms, string(term.origText))
 	}
 	return strings.Join(cacheableTerms, " ")
 }
@@ -217,7 +240,7 @@ func (p *Pattern) Match(chunk *Chunk) []*Item {

 	// ChunkCache: Exact match
 	cacheKey := p.CacheKey()
-	if !p.hasInvTerm { // Because we're excluding Inv-term from cache key
+	if p.cacheable {
 		if cached, found := _cache.Find(chunk, cacheKey); found {
 			return cached
 		}
@@ -242,7 +265,7 @@ Loop:

 	matches := p.matchChunk(space)

-	if !p.hasInvTerm {
+	if p.cacheable {
 		_cache.Add(chunk, cacheKey, matches)
 	}
 	return matches
@@ -250,16 +273,16 @@ Loop:

 func (p *Pattern) matchChunk(chunk *Chunk) []*Item {
 	matches := []*Item{}
-	if p.mode == ModeFuzzy {
+	if !p.extended {
 		for _, item := range *chunk {
-			if sidx, eidx, tlen := p.fuzzyMatch(item); sidx >= 0 {
+			if sidx, eidx, tlen := p.basicMatch(item); sidx >= 0 {
 				matches = append(matches,
 					dupItem(item, []Offset{Offset{int32(sidx), int32(eidx), int32(tlen)}}))
 			}
 		}
 	} else {
 		for _, item := range *chunk {
-			if offsets := p.extendedMatch(item); len(offsets) == len(p.terms) {
+			if offsets := p.extendedMatch(item); len(offsets) == len(p.termSets) {
 				matches = append(matches, dupItem(item, offsets))
 			}
 		}
@@ -269,12 +292,12 @@ func (p *Pattern) matchChunk(chunk *Chunk) []*Item {

 // MatchItem returns true if the Item is a match
 func (p *Pattern) MatchItem(item *Item) bool {
-	if p.mode == ModeFuzzy {
-		sidx, _, _ := p.fuzzyMatch(item)
+	if !p.extended {
+		sidx, _, _ := p.basicMatch(item)
 		return sidx >= 0
 	}
 	offsets := p.extendedMatch(item)
-	return len(offsets) == len(p.terms)
+	return len(offsets) == len(p.termSets)
 }

 func dupItem(item *Item, offsets []Offset) *Item {
@@ -283,29 +306,39 @@ func dupItem(item *Item, offsets []Offset) *Item {
 		text:        item.text,
 		origText:    item.origText,
 		transformed: item.transformed,
-		index:       item.index,
 		offsets:     offsets,
 		colors:      item.colors,
-		rank:        Rank{0, 0, item.index}}
+		rank:        buildEmptyRank(item.Index())}
 }

-func (p *Pattern) fuzzyMatch(item *Item) (int, int, int) {
+func (p *Pattern) basicMatch(item *Item) (int, int, int) {
 	input := p.prepareInput(item)
+	if p.fuzzy {
 		return p.iter(algo.FuzzyMatch, input, p.caseSensitive, p.forward, p.text)
 	}
+	return p.iter(algo.ExactMatchNaive, input, p.caseSensitive, p.forward, p.text)
+}

 func (p *Pattern) extendedMatch(item *Item) []Offset {
 	input := p.prepareInput(item)
 	offsets := []Offset{}
-	for _, term := range p.terms {
+	for _, termSet := range p.termSets {
+		var offset *Offset
+		for _, term := range termSet {
 			pfun := p.procFun[term.typ]
 			if sidx, eidx, tlen := p.iter(pfun, input, term.caseSensitive, p.forward, term.text); sidx >= 0 {
 				if term.inv {
-				break
+					continue
 				}
-			offsets = append(offsets, Offset{int32(sidx), int32(eidx), int32(tlen)})
+				offset = &Offset{int32(sidx), int32(eidx), int32(tlen)}
+				break
 			} else if term.inv {
-			offsets = append(offsets, Offset{0, 0, 0})
+				offset = &Offset{0, 0, 0}
+				continue
+			}
+		}
+		if offset != nil {
+			offsets = append(offsets, *offset)
 		}
 	}
 	return offsets
--- a/src/pattern_test.go
+++ b/src/pattern_test.go
@@ -8,21 +8,26 @@ import (
 )

 func TestParseTermsExtended(t *testing.T) {
-	terms := parseTerms(ModeExtended, CaseSmart,
-		"aaa 'bbb ^ccc ddd$ !eee !'fff !^ggg !hhh$ ^iii$")
+	terms := parseTerms(true, CaseSmart,
+		"| aaa 'bbb ^ccc ddd$ !eee !'fff !^ggg !hhh$ | ^iii$ ^xxx | 'yyy | | zzz$ | !ZZZ |")
 	if len(terms) != 9 ||
-		terms[0].typ != termFuzzy || terms[0].inv ||
-		terms[1].typ != termExact || terms[1].inv ||
-		terms[2].typ != termPrefix || terms[2].inv ||
-		terms[3].typ != termSuffix || terms[3].inv ||
-		terms[4].typ != termFuzzy || !terms[4].inv ||
-		terms[5].typ != termExact || !terms[5].inv ||
-		terms[6].typ != termPrefix || !terms[6].inv ||
-		terms[7].typ != termSuffix || !terms[7].inv ||
-		terms[8].typ != termEqual || terms[8].inv {
+		terms[0][0].typ != termFuzzy || terms[0][0].inv ||
+		terms[1][0].typ != termExact || terms[1][0].inv ||
+		terms[2][0].typ != termPrefix || terms[2][0].inv ||
+		terms[3][0].typ != termSuffix || terms[3][0].inv ||
+		terms[4][0].typ != termFuzzy || !terms[4][0].inv ||
+		terms[5][0].typ != termExact || !terms[5][0].inv ||
+		terms[6][0].typ != termPrefix || !terms[6][0].inv ||
+		terms[7][0].typ != termSuffix || !terms[7][0].inv ||
+		terms[7][1].typ != termEqual || terms[7][1].inv ||
+		terms[8][0].typ != termPrefix || terms[8][0].inv ||
+		terms[8][1].typ != termExact || terms[8][1].inv ||
+		terms[8][2].typ != termSuffix || terms[8][2].inv ||
+		terms[8][3].typ != termFuzzy || !terms[8][3].inv {
 		t.Errorf("%s", terms)
 	}
-	for idx, term := range terms {
+	for idx, termSet := range terms[:8] {
+		term := termSet[0]
 		if len(term.text) != 3 {
 			t.Errorf("%s", term)
 		}
@@ -30,26 +35,31 @@ func TestParseTermsExtended(t *testing.T) {
 			t.Errorf("%s", term)
 		}
 	}
+	for _, term := range terms[8] {
+		if len(term.origText) != 4 {
+			t.Errorf("%s", term)
+		}
+	}
 }

 func TestParseTermsExtendedExact(t *testing.T) {
-	terms := parseTerms(ModeExtendedExact, CaseSmart,
+	terms := parseTerms(false, CaseSmart,
 		"aaa 'bbb ^ccc ddd$ !eee !'fff !^ggg !hhh$")
 	if len(terms) != 8 ||
-		terms[0].typ != termExact || terms[0].inv || len(terms[0].text) != 3 ||
-		terms[1].typ != termFuzzy || terms[1].inv || len(terms[1].text) != 3 ||
-		terms[2].typ != termPrefix || terms[2].inv || len(terms[2].text) != 3 ||
-		terms[3].typ != termSuffix || terms[3].inv || len(terms[3].text) != 3 ||
-		terms[4].typ != termExact || !terms[4].inv || len(terms[4].text) != 3 ||
-		terms[5].typ != termFuzzy || !terms[5].inv || len(terms[5].text) != 3 ||
-		terms[6].typ != termPrefix || !terms[6].inv || len(terms[6].text) != 3 ||
-		terms[7].typ != termSuffix || !terms[7].inv || len(terms[7].text) != 3 {
+		terms[0][0].typ != termExact || terms[0][0].inv || len(terms[0][0].text) != 3 ||
+		terms[1][0].typ != termFuzzy || terms[1][0].inv || len(terms[1][0].text) != 3 ||
+		terms[2][0].typ != termPrefix || terms[2][0].inv || len(terms[2][0].text) != 3 ||
+		terms[3][0].typ != termSuffix || terms[3][0].inv || len(terms[3][0].text) != 3 ||
+		terms[4][0].typ != termExact || !terms[4][0].inv || len(terms[4][0].text) != 3 ||
+		terms[5][0].typ != termFuzzy || !terms[5][0].inv || len(terms[5][0].text) != 3 ||
+		terms[6][0].typ != termPrefix || !terms[6][0].inv || len(terms[6][0].text) != 3 ||
+		terms[7][0].typ != termSuffix || !terms[7][0].inv || len(terms[7][0].text) != 3 {
 		t.Errorf("%s", terms)
 	}
 }

 func TestParseTermsEmpty(t *testing.T) {
-	terms := parseTerms(ModeExtended, CaseSmart, "' $ ^ !' !^ !$")
+	terms := parseTerms(true, CaseSmart, "' $ ^ !' !^ !$")
 	if len(terms) != 0 {
 		t.Errorf("%s", terms)
 	}
@@ -58,25 +68,25 @@ func TestParseTermsEmpty(t *testing.T) {
 func TestExact(t *testing.T) {
 	defer clearPatternCache()
 	clearPatternCache()
-	pattern := BuildPattern(ModeExtended, CaseSmart, true,
+	pattern := BuildPattern(true, true, CaseSmart, true,
 		[]Range{}, Delimiter{}, []rune("'abc"))
 	sidx, eidx := algo.ExactMatchNaive(
-		pattern.caseSensitive, pattern.forward, []rune("aabbcc abc"), pattern.terms[0].text)
+		pattern.caseSensitive, pattern.forward, []rune("aabbcc abc"), pattern.termSets[0][0].text)
 	if sidx != 7 || eidx != 10 {
-		t.Errorf("%s / %d / %d", pattern.terms, sidx, eidx)
+		t.Errorf("%s / %d / %d", pattern.termSets, sidx, eidx)
 	}
 }

 func TestEqual(t *testing.T) {
 	defer clearPatternCache()
 	clearPatternCache()
-	pattern := BuildPattern(ModeExtended, CaseSmart, true, []Range{}, Delimiter{}, []rune("^AbC$"))
+	pattern := BuildPattern(true, true, CaseSmart, true, []Range{}, Delimiter{}, []rune("^AbC$"))

 	match := func(str string, sidxExpected int, eidxExpected int) {
 		sidx, eidx := algo.EqualMatch(
-			pattern.caseSensitive, pattern.forward, []rune(str), pattern.terms[0].text)
+			pattern.caseSensitive, pattern.forward, []rune(str), pattern.termSets[0][0].text)
 		if sidx != sidxExpected || eidx != eidxExpected {
-			t.Errorf("%s / %d / %d", pattern.terms, sidx, eidx)
+			t.Errorf("%s / %d / %d", pattern.termSets, sidx, eidx)
 		}
 	}
 	match("ABC", -1, -1)
@@ -86,17 +96,17 @@ func TestEqual(t *testing.T) {
 func TestCaseSensitivity(t *testing.T) {
 	defer clearPatternCache()
 	clearPatternCache()
-	pat1 := BuildPattern(ModeFuzzy, CaseSmart, true, []Range{}, Delimiter{}, []rune("abc"))
+	pat1 := BuildPattern(true, false, CaseSmart, true, []Range{}, Delimiter{}, []rune("abc"))
 	clearPatternCache()
-	pat2 := BuildPattern(ModeFuzzy, CaseSmart, true, []Range{}, Delimiter{}, []rune("Abc"))
+	pat2 := BuildPattern(true, false, CaseSmart, true, []Range{}, Delimiter{}, []rune("Abc"))
 	clearPatternCache()
-	pat3 := BuildPattern(ModeFuzzy, CaseIgnore, true, []Range{}, Delimiter{}, []rune("abc"))
+	pat3 := BuildPattern(true, false, CaseIgnore, true, []Range{}, Delimiter{}, []rune("abc"))
 	clearPatternCache()
-	pat4 := BuildPattern(ModeFuzzy, CaseIgnore, true, []Range{}, Delimiter{}, []rune("Abc"))
+	pat4 := BuildPattern(true, false, CaseIgnore, true, []Range{}, Delimiter{}, []rune("Abc"))
 	clearPatternCache()
-	pat5 := BuildPattern(ModeFuzzy, CaseRespect, true, []Range{}, Delimiter{}, []rune("abc"))
+	pat5 := BuildPattern(true, false, CaseRespect, true, []Range{}, Delimiter{}, []rune("abc"))
 	clearPatternCache()
-	pat6 := BuildPattern(ModeFuzzy, CaseRespect, true, []Range{}, Delimiter{}, []rune("Abc"))
+	pat6 := BuildPattern(true, false, CaseRespect, true, []Range{}, Delimiter{}, []rune("Abc"))

 	if string(pat1.text) != "abc" || pat1.caseSensitive != false ||
 		string(pat2.text) != "Abc" || pat2.caseSensitive != true ||
@@ -109,19 +119,19 @@ func TestCaseSensitivity(t *testing.T) {
 }

 func TestOrigTextAndTransformed(t *testing.T) {
-	pattern := BuildPattern(ModeExtended, CaseSmart, true, []Range{}, Delimiter{}, []rune("jg"))
+	pattern := BuildPattern(true, true, CaseSmart, true, []Range{}, Delimiter{}, []rune("jg"))
 	tokens := Tokenize([]rune("junegunn"), Delimiter{})
 	trans := Transform(tokens, []Range{Range{1, 1}})

 	origRunes := []rune("junegunn.choi")
-	for _, mode := range []Mode{ModeFuzzy, ModeExtended} {
+	for _, extended := range []bool{false, true} {
 		chunk := Chunk{
 			&Item{
 				text:        []rune("junegunn"),
 				origText:    &origRunes,
 				transformed: trans},
 		}
-		pattern.mode = mode
+		pattern.extended = extended
 		matches := pattern.matchChunk(&chunk)
 		if string(matches[0].text) != "junegunn" || string(*matches[0].origText) != "junegunn.choi" ||
 			matches[0].offsets[0][0] != 0 || matches[0].offsets[0][1] != 5 ||
@@ -130,3 +140,25 @@ func TestOrigTextAndTransformed(t *testing.T) {
 		}
 	}
 }
+
+func TestCacheKey(t *testing.T) {
+	test := func(extended bool, patStr string, expected string, cacheable bool) {
+		pat := BuildPattern(true, extended, CaseSmart, true, []Range{}, Delimiter{}, []rune(patStr))
+		if pat.CacheKey() != expected {
+			t.Errorf("Expected: %s, actual: %s", expected, pat.CacheKey())
+		}
+		if pat.cacheable != cacheable {
+			t.Errorf("Expected: %s, actual: %s (%s)", cacheable, pat.cacheable, patStr)
+		}
+		clearPatternCache()
+	}
+	test(false, "foo !bar", "foo !bar", true)
+	test(false, "foo | bar !baz", "foo | bar !baz", true)
+	test(true, "foo  bar  baz", "foo bar baz", true)
+	test(true, "foo !bar", "foo", false)
+	test(true, "foo !bar   baz", "foo baz", false)
+	test(true, "foo | bar baz", "baz", false)
+	test(true, "foo | bar | baz", "", false)
+	test(true, "foo | bar !baz", "", false)
+	test(true, "| | | foo", "foo", true)
+}
--- a/src/reader.go
+++ b/src/reader.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"io"
 	"os"
-	"os/exec"

 	"github.com/junegunn/fzf/src/util"
 )
@@ -59,7 +58,7 @@ func (r *Reader) readFromStdin() {
 }

 func (r *Reader) readFromCommand(cmd string) {
-	listCommand := exec.Command("sh", "-c", cmd)
+	listCommand := util.ExecCommand(cmd)
 	out, err := listCommand.StdoutPipe()
 	if err != nil {
 		return
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"os"
-	"os/exec"
 	"os/signal"
 	"regexp"
 	"sort"
@@ -22,6 +21,7 @@ import (

 // Terminal represents terminal input/output
 type Terminal struct {
+	initDelay  time.Duration
 	inlineInfo bool
 	prompt     string
 	reverse    bool
@@ -50,7 +50,7 @@ type Terminal struct {
 	progress   int
 	reading    bool
 	merger     *Merger
-	selected   map[uint32]selectedItem
+	selected   map[int32]selectedItem
 	reqBox     *util.EventBox
 	eventBox   *util.EventBox
 	mutex      sync.Mutex
@@ -80,6 +80,7 @@ func (a byTimeOrder) Less(i, j int) bool {

 var _spinner = []string{`-`, `\`, `|`, `/`, `-`, `\`, `|`, `/`}
 var _runeWidths = make(map[rune]int)
+var _tabStop int

 const (
 	reqPrompt util.EventType = iota
@@ -124,6 +125,8 @@ const (
 	actToggleAll
 	actToggleDown
 	actToggleUp
+	actToggleIn
+	actToggleOut
 	actDown
 	actUp
 	actPageUp
@@ -132,6 +135,7 @@ const (
 	actPreviousHistory
 	actNextHistory
 	actExecute
+	actExecuteMulti
 )

 func defaultKeymap() map[int]actionType {
@@ -180,6 +184,7 @@ func defaultKeymap() map[int]actionType {

 	keymap[C.Rune] = actRune
 	keymap[C.Mouse] = actMouse
+	keymap[C.DoubleClick] = actAccept
 	return keymap
 }

@@ -192,7 +197,15 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 	} else {
 		header = reverseStringArray(opts.Header)
 	}
+	_tabStop = opts.Tabstop
+	var delay time.Duration
+	if opts.Tac {
+		delay = initialDelayTac
+	} else {
+		delay = initialDelay
+	}
 	return &Terminal{
+		initDelay:  delay,
 		inlineInfo: opts.InlineInfo,
 		prompt:     opts.Prompt,
 		reverse:    opts.Reverse,
@@ -219,7 +232,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 		ansi:       opts.Ansi,
 		reading:    true,
 		merger:     EmptyMerger,
-		selected:   make(map[uint32]selectedItem),
+		selected:   make(map[int32]selectedItem),
 		reqBox:     util.NewEventBox(),
 		eventBox:   eventBox,
 		mutex:      sync.Mutex{},
@@ -304,21 +317,25 @@ func (t *Terminal) output() bool {
 			found = true
 		}
 	} else {
-		sels := make([]selectedItem, 0, len(t.selected))
-		for _, sel := range t.selected {
-			sels = append(sels, sel)
-		}
-		sort.Sort(byTimeOrder(sels))
-		for _, sel := range sels {
+		for _, sel := range t.sortSelected() {
 			fmt.Println(*sel.text)
 		}
 	}
 	return found
 }

+func (t *Terminal) sortSelected() []selectedItem {
+	sels := make([]selectedItem, 0, len(t.selected))
+	for _, sel := range t.selected {
+		sels = append(sels, sel)
+	}
+	sort.Sort(byTimeOrder(sels))
+	return sels
+}
+
 func runeWidth(r rune, prefixWidth int) int {
 	if r == '\t' {
-		return 8 - prefixWidth%8
+		return _tabStop - prefixWidth%_tabStop
 	} else if w, found := _runeWidths[r]; found {
 		return w
 	} else {
@@ -390,7 +407,7 @@ func (t *Terminal) move(y int, x int, clear bool) {
 }

 func (t *Terminal) placeCursor() {
-	t.move(0, len(t.prompt)+displayWidth(t.input[:t.cx]), false)
+	t.move(0, displayWidth([]rune(t.prompt))+displayWidth(t.input[:t.cx]), false)
 }

 func (t *Terminal) printPrompt() {
@@ -401,7 +418,7 @@ func (t *Terminal) printPrompt() {

 func (t *Terminal) printInfo() {
 	if t.inlineInfo {
-		t.move(0, len(t.prompt)+displayWidth(t.input)+1, true)
+		t.move(0, displayWidth([]rune(t.prompt))+displayWidth(t.input)+1, true)
 		if t.reading {
 			C.CPrint(C.ColSpinner, true, " < ")
 		} else {
@@ -456,9 +473,8 @@ func (t *Terminal) printHeader() {
 		state = newState
 		item := &Item{
 			text:   []rune(trimmed),
-			index:  0,
 			colors: colors,
-			rank:   Rank{0, 0, 0}}
+			rank:   buildEmptyRank(0)}

 		t.move(line, 2, true)
 		t.printHighlighted(item, false, C.ColHeader, 0, false)
@@ -483,7 +499,7 @@ func (t *Terminal) printList() {
 }

 func (t *Terminal) printItem(item *Item, current bool) {
-	_, selected := t.selected[item.index]
+	_, selected := t.selected[item.Index()]
 	if current {
 		C.CPrint(C.ColCursor, true, ">")
 		if selected {
@@ -697,9 +713,13 @@ func keyMatch(key int, event C.Event) bool {
 	return event.Type == key || event.Type == C.Rune && int(event.Char) == key-C.AltZ
 }

-func executeCommand(template string, current string) {
-	command := strings.Replace(template, "{}", fmt.Sprintf("%q", current), -1)
-	cmd := exec.Command("sh", "-c", command)
+func quoteEntry(entry string) string {
+	return fmt.Sprintf("%q", entry)
+}
+
+func executeCommand(template string, replacement string) {
+	command := strings.Replace(template, "{}", replacement, -1)
+	cmd := util.ExecCommand(command)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -712,23 +732,8 @@ func executeCommand(template string, current string) {
 func (t *Terminal) Loop() {
 	<-t.startChan
 	{ // Late initialization
-		t.mutex.Lock()
-		t.initFunc()
-		t.calculateMargins()
-		t.printPrompt()
-		t.placeCursor()
-		C.Refresh()
-		t.printInfo()
-		t.printHeader()
-		t.mutex.Unlock()
-		go func() {
-			timer := time.NewTimer(initialDelay)
-			<-timer.C
-			t.reqBox.Set(reqRefresh, nil)
-		}()
-
 		intChan := make(chan os.Signal, 1)
-		signal.Notify(intChan, os.Interrupt, os.Kill)
+		signal.Notify(intChan, os.Interrupt, os.Kill, syscall.SIGTERM)
 		go func() {
 			<-intChan
 			t.reqBox.Set(reqQuit, nil)
@@ -743,6 +748,21 @@ func (t *Terminal) Loop() {
 			}
 		}()

+		t.mutex.Lock()
+		t.initFunc()
+		t.calculateMargins()
+		t.printPrompt()
+		t.placeCursor()
+		C.Refresh()
+		t.printInfo()
+		t.printHeader()
+		t.mutex.Unlock()
+		go func() {
+			timer := time.NewTimer(t.initDelay)
+			<-timer.C
+			t.reqBox.Set(reqRefresh, nil)
+		}()
+
 		// Keep the spinner spinning
 		go func() {
 			for {
@@ -824,8 +844,8 @@ func (t *Terminal) Loop() {
 			}
 		}
 		selectItem := func(item *Item) bool {
-			if _, found := t.selected[item.index]; !found {
-				t.selected[item.index] = selectedItem{time.Now(), item.StringPtr(t.ansi)}
+			if _, found := t.selected[item.Index()]; !found {
+				t.selected[item.Index()] = selectedItem{time.Now(), item.StringPtr(t.ansi)}
 				return true
 			}
 			return false
@@ -833,7 +853,7 @@ func (t *Terminal) Loop() {
 		toggleY := func(y int) {
 			item := t.merger.Get(y)
 			if !selectItem(item) {
-				delete(t.selected, item.index)
+				delete(t.selected, item.Index())
 			}
 		}
 		toggle := func() {
@@ -850,29 +870,33 @@ func (t *Terminal) Loop() {
 			}
 		}

-		action := t.keymap[event.Type]
-		mapkey := event.Type
-		if event.Type == C.Rune {
-			mapkey = int(event.Char) + int(C.AltZ)
-			if act, prs := t.keymap[mapkey]; prs {
-				action = act
-			}
-		}
+		var doAction func(actionType, int) bool
+		doAction = func(action actionType, mapkey int) bool {
 			switch action {
 			case actIgnore:
 			case actExecute:
 				if t.cy >= 0 && t.cy < t.merger.Length() {
 					item := t.merger.Get(t.cy)
-				executeCommand(t.execmap[mapkey], item.AsString(t.ansi))
+					executeCommand(t.execmap[mapkey], quoteEntry(item.AsString(t.ansi)))
+				}
+			case actExecuteMulti:
+				if len(t.selected) > 0 {
+					sels := make([]string, len(t.selected))
+					for i, sel := range t.sortSelected() {
+						sels[i] = quoteEntry(*sel.text)
+					}
+					executeCommand(t.execmap[mapkey], strings.Join(sels, " "))
+				} else {
+					return doAction(actExecute, mapkey)
 				}
 			case actInvalid:
 				t.mutex.Unlock()
-			continue
+				return false
 			case actToggleSort:
 				t.sort = !t.sort
 				t.eventBox.Set(EvtSearchNew, t.sort)
 				t.mutex.Unlock()
-			continue
+				return false
 			case actBeginningOfLine:
 				t.cx = 0
 			case actBackwardChar:
@@ -918,7 +942,7 @@ func (t *Terminal) Loop() {
 				if t.multi {
 					for i := 0; i < t.merger.Length(); i++ {
 						item := t.merger.Get(i)
-					delete(t.selected, item.index)
+						delete(t.selected, item.Index())
 					}
 					req(reqList, reqInfo)
 				}
@@ -934,6 +958,16 @@ func (t *Terminal) Loop() {
 					}
 					req(reqList, reqInfo)
 				}
+			case actToggleIn:
+				if t.reverse {
+					return doAction(actToggleUp, mapkey)
+				}
+				return doAction(actToggleDown, mapkey)
+			case actToggleOut:
+				if t.reverse {
+					return doAction(actToggleDown, mapkey)
+				}
+				return doAction(actToggleUp, mapkey)
 			case actToggleDown:
 				if t.multi && t.merger.Length() > 0 {
 					toggle()
@@ -1028,7 +1062,7 @@ func (t *Terminal) Loop() {
 					my >= t.marginInt[0] && my < C.MaxY()-t.marginInt[2] {
 					mx -= t.marginInt[3]
 					my -= t.marginInt[0]
-				mx = util.Constrain(mx-len(t.prompt), 0, len(t.input))
+					mx = util.Constrain(mx-displayWidth([]rune(t.prompt)), 0, len(t.input))
 					if !t.reverse {
 						my = t.maxHeight() - my - 1
 					}
@@ -1040,7 +1074,7 @@ func (t *Terminal) Loop() {
 						// Double-click
 						if my >= min {
 							if t.vset(t.offset+my-min) && t.cy < t.merger.Length() {
-							req(reqClose)
+								return doAction(t.keymap[C.DoubleClick], C.DoubleClick)
 							}
 						}
 					} else if me.Down {
@@ -1057,6 +1091,19 @@ func (t *Terminal) Loop() {
 					}
 				}
 			}
+			return true
+		}
+		action := t.keymap[event.Type]
+		mapkey := event.Type
+		if event.Type == C.Rune {
+			mapkey = int(event.Char) + int(C.AltZ)
+			if act, prs := t.keymap[mapkey]; prs {
+				action = act
+			}
+		}
+		if !doAction(action, mapkey) {
+			continue
+		}
 		changed := string(previousInput) != string(t.input)
 		t.mutex.Unlock() // Must be unlocked before touching reqBox

--- a/src/util/util.go
+++ b/src/util/util.go
@@ -5,6 +5,7 @@ import "C"

 import (
 	"os"
+	"os/exec"
 	"time"
 	"unicode/utf8"
 )
@@ -126,3 +127,12 @@ func TrimLen(runes []rune) int {
 	}
 	return i - j + 1
 }
+
+// ExecCommand executes the given command with $SHELL
+func ExecCommand(command string) *exec.Cmd {
+	shell := os.Getenv("SHELL")
+	if len(shell) == 0 {
+		shell = "sh"
+	}
+	return exec.Command(shell, "-c", command)
+}
--- a/test/fzf.vader
+++ b/test/fzf.vader
@@ -1,6 +1,7 @@
 Execute (Setup):
  let g:dir = fnamemodify(g:vader_file, ':p:h')
  Log 'Test directory: ' . g:dir
+  Save &acd

 Execute (fzf#run with dir option):
  let cwd = getcwd()
@@ -35,6 +36,34 @@ Execute (fzf#run with string source):
  let result = sort(fzf#run({ 'source': 'echo hi', 'options': '-f i' }))
  AssertEqual ['hi'], result

+Execute (fzf#run with dir option and noautochdir):
+  set noacd
+  let cwd = getcwd()
+  call fzf#run({'source': ['/foobar'], 'sink': 'e', 'dir': '/tmp', 'options': '-1'})
+  " No change in working directory
+  AssertEqual cwd, getcwd()
+
+Execute (Incomplete fzf#run with dir option and autochdir):
+  set acd
+  let cwd = getcwd()
+  call fzf#run({'source': [], 'sink': 'e', 'dir': '/tmp', 'options': '-0'})
+  " No change in working directory even if &acd is set
+  AssertEqual cwd, getcwd()
+
+Execute (fzf#run with dir option and autochdir):
+  set acd
+  let cwd = getcwd()
+  call fzf#run({'source': ['/foobar'], 'sink': 'e', 'dir': '/tmp', 'options': '-1'})
+  " Working directory changed due to &acd
+  AssertEqual '/', getcwd()
+
+Execute (fzf#run with dir option and autochdir when final cwd is same as dir):
+  set acd
+  cd /tmp
+  call fzf#run({'source': ['/foobar'], 'sink': 'e', 'dir': '/', 'options': '-1'})
+  " Working directory changed due to &acd
+  AssertEqual '/', getcwd()
+
 Execute (Cleanup):
  unlet g:dir
  Restore
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -6,9 +6,10 @@ require 'fileutils'

 DEFAULT_TIMEOUT = 20

+FILE = File.expand_path(__FILE__)
 base = File.expand_path('../../', __FILE__)
 Dir.chdir base
-FZF = "#{base}/bin/fzf"
+FZF = "FZF_DEFAULT_OPTS= FZF_DEFAULT_COMMAND= #{base}/bin/fzf"

 class NilClass
  def include? str
@@ -142,8 +143,10 @@ class TestBase < Minitest::Test
  attr_reader :tmux

  def tempname
+    @temp_suffix ||= 0
    [TEMPNAME,
-     caller_locations.map(&:label).find { |l| l =~ /^test_/ }].join '-'
+     caller_locations.map(&:label).find { |l| l =~ /^test_/ },
+     @temp_suffix].join '-'
  end

  def setup
@@ -157,6 +160,7 @@ class TestBase < Minitest::Test
    File.read(tempname)
  ensure
    File.unlink tempname while File.exists?(tempname)
+    @temp_suffix += 1
    tmux.prepare
  end

@@ -213,7 +217,7 @@ class TestGoFZF < TestBase
  end

  def test_fzf_default_command
-    tmux.send_keys "FZF_DEFAULT_COMMAND='echo hello' #{fzf}", :Enter
+    tmux.send_keys fzf.sub('FZF_DEFAULT_COMMAND=', "FZF_DEFAULT_COMMAND='echo hello'"), :Enter
    tmux.until { |lines| lines.last =~ /^>/ }

    tmux.send_keys :Enter
@@ -458,8 +462,8 @@ class TestGoFZF < TestBase

  def test_unicode_case
    writelines tempname, %w[строКА1 СТРОКА2 строка3 Строка4]
-    assert_equal %w[СТРОКА2 Строка4], `cat #{tempname} | #{FZF} -fС`.split($/)
-    assert_equal %w[строКА1 СТРОКА2 строка3 Строка4], `cat #{tempname} | #{FZF} -fс`.split($/)
+    assert_equal %w[СТРОКА2 Строка4], `#{FZF} -fС < #{tempname}`.split($/)
+    assert_equal %w[строКА1 СТРОКА2 строка3 Строка4], `#{FZF} -fс < #{tempname}`.split($/)
  end

  def test_tiebreak
@@ -471,7 +475,7 @@ class TestGoFZF < TestBase
    ]
    writelines tempname, input

-    assert_equal input, `cat #{tempname} | #{FZF} -ffoobar --tiebreak=index`.split($/)
+    assert_equal input, `#{FZF} -ffoobar --tiebreak=index < #{tempname}`.split($/)

    by_length = %w[
      ----foobar--
@@ -479,8 +483,8 @@ class TestGoFZF < TestBase
      -------foobar-
      --foobar--------
    ]
-    assert_equal by_length, `cat #{tempname} | #{FZF} -ffoobar`.split($/)
-    assert_equal by_length, `cat #{tempname} | #{FZF} -ffoobar --tiebreak=length`.split($/)
+    assert_equal by_length, `#{FZF} -ffoobar < #{tempname}`.split($/)
+    assert_equal by_length, `#{FZF} -ffoobar --tiebreak=length < #{tempname}`.split($/)

    by_begin = %w[
      --foobar--------
@@ -488,17 +492,175 @@ class TestGoFZF < TestBase
      -----foobar---
      -------foobar-
    ]
-    assert_equal by_begin, `cat #{tempname} | #{FZF} -ffoobar --tiebreak=begin`.split($/)
-    assert_equal by_begin, `cat #{tempname} | #{FZF} -f"!z foobar" -x --tiebreak begin`.split($/)
+    assert_equal by_begin, `#{FZF} -ffoobar --tiebreak=begin < #{tempname}`.split($/)
+    assert_equal by_begin, `#{FZF} -f"!z foobar" -x --tiebreak begin < #{tempname}`.split($/)

    assert_equal %w[
      -------foobar-
      ----foobar--
      -----foobar---
      --foobar--------
-    ], `cat #{tempname} | #{FZF} -ffoobar --tiebreak end`.split($/)
+    ], `#{FZF} -ffoobar --tiebreak end < #{tempname}`.split($/)

-    assert_equal input, `cat #{tempname} | #{FZF} -f"!z" -x --tiebreak end`.split($/)
+    assert_equal input, `#{FZF} -f"!z" -x --tiebreak end < #{tempname}`.split($/)
+  end
+
+  # Since 0.11.2
+  def test_tiebreak_list
+    input = %w[
+      f-o-o-b-a-r
+      foobar----
+      --foobar
+      ----foobar
+      foobar--
+      --foobar--
+      foobar
+    ]
+    writelines tempname, input
+
+    assert_equal %w[
+      foobar----
+      --foobar
+      ----foobar
+      foobar--
+      --foobar--
+      foobar
+      f-o-o-b-a-r
+    ], `#{FZF} -ffb --tiebreak=index < #{tempname}`.split($/)
+
+    by_length = %w[
+      foobar
+      --foobar
+      foobar--
+      foobar----
+      ----foobar
+      --foobar--
+      f-o-o-b-a-r
+    ]
+    assert_equal by_length, `#{FZF} -ffb < #{tempname}`.split($/)
+    assert_equal by_length, `#{FZF} -ffb --tiebreak=length < #{tempname}`.split($/)
+
+    assert_equal %w[
+      foobar
+      foobar--
+      --foobar
+      foobar----
+      --foobar--
+      ----foobar
+      f-o-o-b-a-r
+    ], `#{FZF} -ffb --tiebreak=length,begin < #{tempname}`.split($/)
+
+    assert_equal %w[
+      foobar
+      --foobar
+      foobar--
+      ----foobar
+      --foobar--
+      foobar----
+      f-o-o-b-a-r
+    ], `#{FZF} -ffb --tiebreak=length,end < #{tempname}`.split($/)
+
+    assert_equal %w[
+      foobar----
+      foobar--
+      foobar
+      --foobar
+      --foobar--
+      ----foobar
+      f-o-o-b-a-r
+    ], `#{FZF} -ffb --tiebreak=begin < #{tempname}`.split($/)
+
+    by_begin_end = %w[
+      foobar
+      foobar--
+      foobar----
+      --foobar
+      --foobar--
+      ----foobar
+      f-o-o-b-a-r
+    ]
+    assert_equal by_begin_end, `#{FZF} -ffb --tiebreak=begin,length < #{tempname}`.split($/)
+    assert_equal by_begin_end, `#{FZF} -ffb --tiebreak=begin,end < #{tempname}`.split($/)
+
+    assert_equal %w[
+      --foobar
+      ----foobar
+      foobar
+      foobar--
+      --foobar--
+      foobar----
+      f-o-o-b-a-r
+    ], `#{FZF} -ffb --tiebreak=end < #{tempname}`.split($/)
+
+    by_begin_end = %w[
+      foobar
+      --foobar
+      ----foobar
+      foobar--
+      --foobar--
+      foobar----
+      f-o-o-b-a-r
+    ]
+    assert_equal by_begin_end, `#{FZF} -ffb --tiebreak=end,begin < #{tempname}`.split($/)
+    assert_equal by_begin_end, `#{FZF} -ffb --tiebreak=end,length < #{tempname}`.split($/)
+  end
+
+  def test_tiebreak_white_prefix
+    writelines tempname, [
+      'f o o b a r',
+      '    foo bar',
+      '    foobar',
+      '----foo bar',
+      '----foobar',
+      '  foo bar',
+      '  foobar--',
+      '  foobar',
+      '--foo bar',
+      '--foobar',
+      'foobar',
+    ]
+
+    assert_equal [
+      '    foobar',
+      '  foobar',
+      'foobar',
+      '  foobar--',
+      '--foobar',
+      '----foobar',
+      '    foo bar',
+      '  foo bar',
+      '--foo bar',
+      '----foo bar',
+      'f o o b a r',
+    ], `#{FZF} -ffb < #{tempname}`.split($/)
+
+    assert_equal [
+      '    foobar',
+      '  foobar--',
+      '  foobar',
+      'foobar',
+      '--foobar',
+      '----foobar',
+      '    foo bar',
+      '  foo bar',
+      '--foo bar',
+      '----foo bar',
+      'f o o b a r',
+    ], `#{FZF} -ffb --tiebreak=begin < #{tempname}`.split($/)
+
+    assert_equal [
+      '    foobar',
+      '  foobar',
+      'foobar',
+      '  foobar--',
+      '--foobar',
+      '----foobar',
+      '    foo bar',
+      '  foo bar',
+      '--foo bar',
+      '----foo bar',
+      'f o o b a r',
+    ], `#{FZF} -ffb --tiebreak=begin,length < #{tempname}`.split($/)
  end

  def test_tiebreak_length_with_nth
@@ -516,7 +678,7 @@ class TestGoFZF < TestBase
      123:hello
      1234567:h
    ]
-    assert_equal output, `cat #{tempname} | #{FZF} -fh`.split($/)
+    assert_equal output, `#{FZF} -fh < #{tempname}`.split($/)

    output = %w[
      1234567:h
@@ -524,7 +686,7 @@ class TestGoFZF < TestBase
      1:hell
      123:hello
    ]
-    assert_equal output, `cat #{tempname} | #{FZF} -fh -n2 -d:`.split($/)
+    assert_equal output, `#{FZF} -fh -n2 -d: < #{tempname}`.split($/)
  end

  def test_tiebreak_length_with_nth_trim_length
@@ -543,7 +705,7 @@ class TestGoFZF < TestBase
      "apple juice   bottle 1",
      "apple  ui     bottle 2",
    ]
-    assert_equal output, `cat #{tempname} | #{FZF} -fa -n1`.split($/)
+    assert_equal output, `#{FZF} -fa -n1 < #{tempname}`.split($/)

    # len(1 ~ 2)
    output = [
@@ -552,7 +714,7 @@ class TestGoFZF < TestBase
      "apple juice   bottle 1",
      "app     ice   bottle 3",
    ]
-    assert_equal output, `cat #{tempname} | #{FZF} -fai -n1..2`.split($/)
+    assert_equal output, `#{FZF} -fai -n1..2 < #{tempname}`.split($/)

    # len(1) + len(2)
    output = [
@@ -561,7 +723,7 @@ class TestGoFZF < TestBase
      "apple  ui     bottle 2",
      "apple juice   bottle 1",
    ]
-    assert_equal output, `cat #{tempname} | #{FZF} -x -f"a i" -n1,2`.split($/)
+    assert_equal output, `#{FZF} -x -f"a i" -n1,2 < #{tempname}`.split($/)

    # len(2)
    output = [
@@ -570,8 +732,8 @@ class TestGoFZF < TestBase
      "app     ice   bottle 3",
      "apple juice   bottle 1",
    ]
-    assert_equal output, `cat #{tempname} | #{FZF} -fi -n2`.split($/)
-    assert_equal output, `cat #{tempname} | #{FZF} -fi -n2,1..2`.split($/)
+    assert_equal output, `#{FZF} -fi -n2 < #{tempname}`.split($/)
+    assert_equal output, `#{FZF} -fi -n2,1..2 < #{tempname}`.split($/)
  end

  def test_tiebreak_end_backward_scan
@@ -581,8 +743,8 @@ class TestGoFZF < TestBase
    ]
    writelines tempname, input

-    assert_equal input.reverse, `cat #{tempname} | #{FZF} -f fb`.split($/)
-    assert_equal input, `cat #{tempname} | #{FZF} -f fb --tiebreak=end`.split($/)
+    assert_equal input.reverse, `#{FZF} -f fb < #{tempname}`.split($/)
+    assert_equal input, `#{FZF} -f fb --tiebreak=end < #{tempname}`.split($/)
  end

  def test_invalid_cache
@@ -612,7 +774,7 @@ class TestGoFZF < TestBase
    File.open(tempname, 'w') do |f|
      f << data
    end
-    assert_equal data, `cat #{tempname} | #{FZF} -f .`.chomp
+    assert_equal data, `#{FZF} -f . < #{tempname}`.chomp
  end

  def test_read0
@@ -713,6 +875,40 @@ class TestGoFZF < TestBase
    File.unlink output rescue nil
  end

+  def test_execute_multi
+    output = '/tmp/fzf-test-execute-multi'
+    opts = %[--multi --bind \\"alt-a:execute-multi(echo '[{}], @{}@' >> #{output})\\"]
+    tmux.send_keys "seq 100 | #{fzf opts}", :Enter
+    tmux.until { |lines| lines[-2].include? '100/100' }
+    tmux.send_keys :Escape, :a
+    tmux.send_keys :BTab, :BTab, :BTab
+    tmux.send_keys :Escape, :a
+    tmux.send_keys :Tab, :Tab
+    tmux.send_keys :Escape, :a
+    tmux.send_keys :Enter
+    readonce
+    assert_equal ['["1"], @"1"@', '["1" "2" "3"], @"1" "2" "3"@', '["1" "2" "4"], @"1" "2" "4"@'],
+      File.readlines(output).map(&:chomp)
+  ensure
+    File.unlink output rescue nil
+  end
+
+  def test_execute_shell
+    # Custom script to use as $SHELL
+    output = tempname + '.out'
+    File.unlink output rescue nil
+    writelines tempname, ['#!/usr/bin/env bash', "echo $1 / $2 > #{output}"]
+    system "chmod +x #{tempname}"
+
+    tmux.send_keys "echo foo | SHELL=#{tempname} fzf --bind 'enter:execute:{}bar'", :Enter
+    tmux.until { |lines| lines[-2].include? '1/1' }
+    tmux.send_keys :Enter
+    tmux.send_keys 'C-c'
+    assert_equal ['-c / "foo"bar'], File.readlines(output).map(&:chomp)
+  ensure
+    File.unlink output rescue nil
+  end
+
  def test_cycle
    tmux.send_keys "seq 8 | #{fzf :cycle}", :Enter
    tmux.until { |lines| lines[-2].include? '8/8' }
@@ -785,8 +981,8 @@ class TestGoFZF < TestBase
  end

  def test_header
-    tmux.send_keys "seq 100 | #{fzf "--header \\\"\\$(head -5 #{__FILE__})\\\""}", :Enter
-    header = File.readlines(__FILE__).take(5).map(&:strip)
+    tmux.send_keys "seq 100 | #{fzf "--header \\\"\\$(head -5 #{FILE})\\\""}", :Enter
+    header = File.readlines(FILE).take(5).map(&:strip)
    tmux.until do |lines|
      lines[-2].include?('100/100') &&
      lines[-7..-3].map(&:strip) == header
@@ -794,8 +990,8 @@ class TestGoFZF < TestBase
  end

  def test_header_reverse
-    tmux.send_keys "seq 100 | #{fzf "--header=\\\"\\$(head -5 #{__FILE__})\\\" --reverse"}", :Enter
-    header = File.readlines(__FILE__).take(5).map(&:strip)
+    tmux.send_keys "seq 100 | #{fzf "--header=\\\"\\$(head -5 #{FILE})\\\" --reverse"}", :Enter
+    header = File.readlines(FILE).take(5).map(&:strip)
    tmux.until do |lines|
      lines[1].include?('100/100') &&
      lines[2..6].map(&:strip) == header
@@ -803,8 +999,8 @@ class TestGoFZF < TestBase
  end

  def test_header_and_header_lines
-    tmux.send_keys "seq 100 | #{fzf "--header-lines 10 --header \\\"\\$(head -5 #{__FILE__})\\\""}", :Enter
-    header = File.readlines(__FILE__).take(5).map(&:strip)
+    tmux.send_keys "seq 100 | #{fzf "--header-lines 10 --header \\\"\\$(head -5 #{FILE})\\\""}", :Enter
+    header = File.readlines(FILE).take(5).map(&:strip)
    tmux.until do |lines|
      lines[-2].include?('90/90') &&
      lines[-7...-2].map(&:strip) == header &&
@@ -813,8 +1009,8 @@ class TestGoFZF < TestBase
  end

  def test_header_and_header_lines_reverse
-    tmux.send_keys "seq 100 | #{fzf "--reverse --header-lines 10 --header \\\"\\$(head -5 #{__FILE__})\\\""}", :Enter
-    header = File.readlines(__FILE__).take(5).map(&:strip)
+    tmux.send_keys "seq 100 | #{fzf "--reverse --header-lines 10 --header \\\"\\$(head -5 #{FILE})\\\""}", :Enter
+    header = File.readlines(FILE).take(5).map(&:strip)
    tmux.until do |lines|
      lines[1].include?('90/90') &&
      lines[2...7].map(&:strip) == header &&
@@ -847,20 +1043,40 @@ class TestGoFZF < TestBase
    tmux.send_keys :Enter
  end

+  def test_tabstop
+    writelines tempname, ["f\too\tba\tr\tbaz\tbarfooq\tux"]
+    {
+      1 => '> f oo ba r baz barfooq ux',
+      2 => '> f oo  ba  r baz barfooq ux',
+      3 => '> f  oo ba r  baz   barfooq  ux',
+      4 => '> f   oo  ba  r   baz barfooq ux',
+      5 => '> f    oo   ba   r    baz  barfooq   ux',
+      6 => '> f     oo    ba    r     baz   barfooq     ux',
+      7 => '> f      oo     ba     r      baz    barfooq       ux',
+      8 => '> f       oo      ba      r       baz     barfooq ux',
+      9 => '> f        oo       ba       r        baz      barfooq  ux',
+    }.each do |ts, exp|
+      tmux.prepare
+      tmux.send_keys %[cat #{tempname} | fzf --tabstop=#{ts}], :Enter
+      tmux.until { |lines| exp.start_with? lines[-3].to_s.strip.sub(/\.\.$/, '') }
+      tmux.send_keys :Enter
+    end
+  end
+
  def test_with_nth
    writelines tempname, ['hello world ', 'byebye']
-    assert_equal 'hello world ', `cat #{tempname} | #{FZF} -f"^he hehe" -x -n 2.. --with-nth 2,1,1`.chomp
+    assert_equal 'hello world ', `#{FZF} -f"^he hehe" -x -n 2.. --with-nth 2,1,1 < #{tempname}`.chomp
  end

  def test_with_nth_ansi
    writelines tempname, ["\x1b[33mhello \x1b[34;1mworld\x1b[m ", 'byebye']
-    assert_equal 'hello world ', `cat #{tempname} | #{FZF} -f"^he hehe" -x -n 2.. --with-nth 2,1,1 --ansi`.chomp
+    assert_equal 'hello world ', `#{FZF} -f"^he hehe" -x -n 2.. --with-nth 2,1,1 --ansi < #{tempname}`.chomp
  end

  def test_with_nth_no_ansi
    src = "\x1b[33mhello \x1b[34;1mworld\x1b[m "
    writelines tempname, [src, 'byebye']
-    assert_equal src, `cat #{tempname} | #{FZF} -fhehe -x -n 2.. --with-nth 2,1,1 --no-ansi`.chomp
+    assert_equal src, `#{FZF} -fhehe -x -n 2.. --with-nth 2,1,1 --no-ansi < #{tempname}`.chomp
  end

  def test_exit_0_exit_code
@@ -904,6 +1120,23 @@ class TestGoFZF < TestBase
    end
  end

+  def test_default_extended
+    assert_equal '100', `seq 100 | #{FZF} -f "1 00$"`.chomp
+    assert_equal '', `seq 100 | #{FZF} -f "1 00$" +x`.chomp
+  end
+
+  def test_exact
+    assert_equal 4, `seq 123 | #{FZF} -f 13`.lines.length
+    assert_equal 2, `seq 123 | #{FZF} -f 13 -e`.lines.length
+    assert_equal 4, `seq 123 | #{FZF} -f 13 +e`.lines.length
+  end
+
+  def test_or_operator
+    assert_equal %w[1 5 10], `seq 10 | #{FZF} -f "1 | 5"`.lines.map(&:chomp)
+    assert_equal %w[1 10 2 3 4 5 6 7 8 9],
+      `seq 10 | #{FZF} -f '1 | !1'`.lines.map(&:chomp)
+  end
+
 private
  def writelines path, lines
    File.unlink path while File.exists? path
@@ -970,6 +1203,22 @@ module TestShell
    tmux.until { |lines| lines[-1].end_with?(expected) }
  end

+  def test_alt_c_command
+    set_var 'FZF_ALT_C_COMMAND', 'echo /tmp'
+
+    tmux.prepare
+    tmux.send_keys 'cd /', :Enter
+
+    tmux.prepare
+    tmux.send_keys :Escape, :c, pane: 0
+    lines = tmux.until(1) { |lines| lines.item_count == 1 }
+    tmux.send_keys :Enter, pane: 1
+
+    tmux.prepare
+    tmux.send_keys :pwd, :Enter
+    tmux.until { |lines| lines[-1].end_with? '/tmp' }
+  end
+
  def test_ctrl_r
    tmux.prepare
    tmux.send_keys 'echo 1st', :Enter; tmux.prepare
@@ -999,6 +1248,8 @@ module CompletionTest
    tmux.prepare
    tmux.send_keys 'cat /tmp/fzf-test/10**', :Tab, pane: 0
    tmux.until(1) { |lines| lines.item_count > 0 }
+    tmux.send_keys ' !d'
+    tmux.until(1) { |lines| lines[-2].include?(' 2/') }
    tmux.send_keys :BTab, :BTab
    tmux.until(1) { |lines| lines[-2].include?('(2)') }
    tmux.send_keys :Enter
@@ -1034,17 +1285,33 @@ module CompletionTest
    tmux.send_keys 'C-u'
    tmux.send_keys 'cat /tmp/fzf\ test/**', :Tab, pane: 0
    tmux.until(1) { |lines| lines.item_count > 0 }
-    tmux.send_keys :Enter
+    tmux.send_keys 'C-K', :Enter
    tmux.until do |lines|
      tmux.send_keys 'C-L'
      lines[-1].end_with?('/tmp/fzf\ test/foobar')
    end
+
+    # Should include hidden files
+    (1..100).each { |i| FileUtils.touch "/tmp/fzf-test/.hidden-#{i}" }
+    tmux.send_keys 'C-u'
+    tmux.send_keys 'cat /tmp/fzf-test/hidden**', :Tab, pane: 0
+    tmux.until(1) do |lines|
+      tmux.send_keys 'C-L'
+      lines[-2].include?('100/') &&
+      lines[-3].include?('/tmp/fzf-test/.hidden-')
+    end
  ensure
    ['/tmp/fzf-test', '/tmp/fzf test', '~/.fzf-home', 'no~such~user'].each do |f|
      FileUtils.rm_rf File.expand_path(f)
    end
  end

+  def test_file_completion_root
+    tmux.send_keys 'ls /**', :Tab, pane: 0
+    tmux.until(1) { |lines| lines.item_count > 0 }
+    tmux.send_keys :Enter
+  end
+
  def test_dir_completion
    tmux.send_keys 'mkdir -p /tmp/fzf-test/d{1..100}; touch /tmp/fzf-test/d55/xxx', :Enter
    tmux.prepare
@@ -1088,6 +1355,20 @@ module CompletionTest
      tmux.send_keys 'C-L'
      lines[-1] == "kill #{pid}"
    end
+
+    def test_custom_completion
+      tmux.send_keys '_fzf_compgen_path() { echo "\$1"; seq 10; }', :Enter
+      tmux.prepare
+      tmux.send_keys 'ls /tmp/**', :Tab, pane: 0
+      tmux.until(1) { |lines| lines.item_count == 11 }
+      tmux.send_keys :BTab, :BTab, :BTab
+      tmux.until(1) { |lines| lines[-2].include? '(3)' }
+      tmux.send_keys :Enter
+      tmux.until do |lines|
+        tmux.send_keys 'C-L'
+        lines[-1] == "ls /tmp 1 2"
+      end
+    end
  ensure
    Process.kill 'KILL', pid.to_i rescue nil if pid
  end
Author	SHA1	Message	Date
Junegunn Choi	40d934e378	0.11.3	2016-02-07 11:00:10 +09:00
Junegunn Choi	e95d82748f	Use $SHELL to start $FZF_DEFAULT_COMMAND (#481 )	2016-02-07 01:49:29 +09:00
Junegunn Choi	30bd0b53db	Fix #481 - Use $SHELL instead of sh in execute action Note that $SHELL only points to the default shell instead of the current shell. If you're on a non-default shell, you might want to override the value like follows. SHELL=zsh fzf --bind 'enter:execute:echo $ZSH_VERSION; sleep 1'	2016-02-03 04:46:02 +09:00
Junegunn Choi	1893eca41a	Handle SIGTERM gracefully (#482 )	2016-02-02 17:51:21 +09:00
Junegunn Choi	82067463b8	[completion] _fzf_complete_COMMAND_post for post processing e.g. _fzf_complete_foo() { _fzf_complete "--multi --reverse --header-lines=3" "$@" < <( ls -al ) } _fzf_complete_foo_post() { awk '{print $NF}' } [ -n "$BASH" ] && complete -F _fzf_complete_foo -o default -o bashdefault foo	2016-01-29 01:31:04 +09:00
Junegunn Choi	ce9c51d399	Typo	2016-01-20 01:39:55 +09:00
Junegunn Choi	96176476f3	Make fuzzy completion customizable with _fzf_compgen_{path,dir} Notes: - You can now override _fzf_compgen_path and _fzf_compgen_dir functions to use custom commands such as ag instead of find for listing completion candidates. - The first argument is the base path to start traversal - Removed file-only completion in bash, i.e. _fzf_file_completion. Maintaining a list of commands that only expect files, not directories, is cumbersome (there are too many) and error-prone. TBD: - Added $FZF_COMPLETION_DIR_COMMANDS to customize the list of commands which use directory-only completion. The default is "cd pushd rmdir". Not sure if it's the best approach to address the requirement, I'll leave it as an undocumented feature. Related: #406 (@thomcom), #456 (@frizinak)	2016-01-20 01:38:24 +09:00
Junegunn Choi	68c84264af	Update CHANGELOG	2016-01-16 21:13:57 +09:00
Junegunn Choi	69438a55ca	Update CHANGELOG: 0.11.2	2016-01-16 21:11:40 +09:00
Junegunn Choi	8695b5e319	Reduce the initial delay when --tac is not given fzf defers the initial rendering of the screen up to 100ms if the input stream is ongoing to prevent unnecessary redraw during the initial phase. However, 100ms delay is quite noticeable and might give the impression that fzf is not snappy enough. This commit reduces the maximum delay down to 20ms when --tac is not specified, in which case the input list quickly fills the entire screen.	2016-01-16 18:07:50 +09:00
Junegunn Choi	95970164ad	0.11.2	2016-01-14 02:54:08 +09:00
Junegunn Choi	f6c6e59a50	Add toggle-in and toggle-out for --bind Related: #452 When `--multi` is set, tab key will bring your cursor down, and shift-tab up. But since fzf by default draws the screen in bottom-up fashion, one may feel that the opposite of the behavior is more desirable and choose to customize the key bindings as follows. export FZF_DEFAULT_OPTS="--bind tab:toggle-up,shift-tab:toggle-down" This configuration, however, becomes no longer straightforward when `--reverse` is set and fzf switches to top-down layout. To address the requirement, this commit adds `toggle-in` and `toggle-out` option which switch direction depending on `--reverse`-ness. export FZF_DEFAULT_OPTS="--bind tab:toggle-out,shift-tab:toggle-in"	2016-01-14 02:35:43 +09:00
Junegunn Choi	45143f9541	Ignore leading whitespaces when calculating 'begin' index	2016-01-14 01:32:03 +09:00
Junegunn Choi	23244bb410	[fish] Fix intermittent errors on CTRL-T This seems like a bug of fish, but sometimes when you select an item fish complains: "insertion mode switches can not be used when not in insertion mode" This only happens when using tmux pane. Injecting a dummy command somehow fixes the issue.	2016-01-14 01:12:49 +09:00
Junegunn Choi	edb647667e	Change temporary file names to fix flaky tests	2016-01-14 01:12:49 +09:00
Junegunn Choi	8d3a302a17	Simplify Item structure This commit compensates for the performance overhead from the extended tiebreak option.	2016-01-14 01:12:49 +09:00
Junegunn Choi	1d2d32c847	Accept comma-separated list of sort criteria	2016-01-13 21:27:43 +09:00
Junegunn Choi	d635b3fd3c	Update license: 2016	2016-01-13 02:16:26 +09:00
Junegunn Choi	0f281ef894	[vim] Try to make 'dir' option compatible with &autochdir When 'dir' option is passed to fzf#run(), the current working directory is temporarily changed to the given directory, and restored at the end. However, this behavior is not compatible with &autochdir. This commit introduces a heuristic to determine whether or not to restore the previous working directory. Related: https://github.com/junegunn/fzf.vim/issues/70	2016-01-12 01:15:36 +09:00
Junegunn Choi	b18db4733c	[vim] Do not restore working directory on unexpected cwd We should not restore the previous working directory if the current directory has changed somehow. This can happen when &autochdir is set.	2016-01-11 18:17:13 +09:00
Junegunn Choi	6e08fe337c	[nvim] setlocal nospell on terminal buffer Close #469. `setlocal nospell` should appear before `setf fzf` to allow customization of the option.	2016-01-09 12:08:25 +09:00
Junegunn Choi	2a2c0a0957	[fzf-tmux] Turn off remain-on-exit option Related: https://github.com/junegunn/fzf.vim/issues/67	2016-01-07 01:42:03 +09:00
Junegunn Choi	4230b6f3c9	[fzf-tmux] Fix #466 - Make fifos writable by other users	2016-01-07 00:32:38 +09:00
Junegunn Choi	aa171b45cb	Fix ubuntu-android target of Makefile	2016-01-05 02:10:40 +09:00
Junegunn Choi	661d06c90a	Add regression test case for #458	2015-12-29 13:02:16 +09:00
Junegunn Choi	a9aa263d3a	Merge pull request #458 from frizinak/fix-autocomplete-abs Fix auto-completion for `/`	2015-12-29 08:22:52 +09:00
Kobe Lipkens	6208fc9cfd	Fix autocompletion for absolute paths	2015-12-28 21:11:04 +01:00
Junegunn Choi	e1dd798482	[bash/zsh-completion] List hidden files as well Close #456 and #457	2015-12-29 00:21:38 +09:00
Junegunn Choi	c8a3f6f06a	Merge pull request #455 from frizinak/master Pass FZF_DEFAULT_OPTS to non-interactive bash instance	2015-12-28 00:09:22 +09:00
Kobe Lipkens	3b9984379c	Pass FZF_DEFAULT_OPTS to non-interactive bash instance	2015-12-25 21:05:25 +01:00
Junegunn Choi	a1b60b1d42	Fix Travis CI build The size of pseudo-terminal in Travis CI environment can be small	2015-12-20 01:47:07 +09:00
Junegunn Choi	b5850ebd4c	[vim] Open selected file in the current window if it's empty Close #451	2015-12-18 12:19:29 +09:00
Junegunn Choi	ac0a62e494	Merge pull request #446 from chaoren/master Fix CTRL-T in tmux	2015-12-13 01:11:02 +09:00
Chaoren Lin	54b4b0c56f	Dynamically select which __fzf_select__ to use for tmux with bash 4+. Instead of choosing one at initialization, choose the correct one when it's actually called, so that the behavior is correct even after resizing. Bonus fixes for tmux with bash 4+: - No extra space when cancelling CTRL-T. - Fix cursor position problem in vi mode.	2015-12-11 10:02:35 -08:00
Chaoren Lin	033afde3b5	Fix CTRL-T in tmux with non-standard configuration. - Don't assume ~/.fzf.bash exists. - Source the current script for __fzf_select__. - Forward $PATH.	2015-12-11 00:18:45 -08:00
Junegunn Choi	a07944a5bb	Merge pull request #439 from pokey/master Correct fzf-tmux tmux checking bug	2015-12-09 12:43:42 +09:00
Pokey Rule	32010055e1	Correct fzf-tmux tmux checking bug	2015-12-08 17:33:44 -08:00
Junegunn Choi	971ea2217c	Merge pull request #433 from pokey/master Support fzf-tmux when zoomed	2015-12-08 10:56:06 +09:00
Pokey Rule	d513a210c6	Support fzf-tmux when zoomed	2015-12-07 17:45:22 -08:00
Junegunn Choi	a1db64e7b1	Unset GO15VENDOREXPERIMENT in linux build env (#430 )	2015-12-04 16:47:02 +09:00
Junegunn Choi	0b9c4e1e74	Remove submodules and disable GO15VENDOREXPERIMENT (#430 ) Having submodules causes vim-plug or other vim plugin managers to clone them with no real benefit to the end-users. There's currently no compelling reason for me to use submodules.	2015-12-04 16:45:23 +09:00
Junegunn Choi	248320fa55	0.11.1	2015-12-01 00:39:45 +09:00
Junegunn Choi	d4e26707c7	GO15VENDOREXPERIMENT=1 (#430 )	2015-11-30 18:41:53 +09:00
Junegunn Choi	99ea1056ac	Add --tabstop option Related: https://github.com/junegunn/fzf.vim/issues/49	2015-11-30 17:35:03 +09:00
Junegunn Choi	7bcf4effa5	Fix test failure - use absolute path	2015-11-30 17:32:40 +09:00
Junegunn Choi	e1df876b61	Merge pull request #380 from acornejo/android Add android build: `make android`	2015-11-20 03:28:41 +09:00
Alex Cornejo	28ffb9638d	add android build	2015-11-18 23:20:51 -08:00
Junegunn Choi	1c20255504	Fix typos in help message Close #425. Thanks to @blueyed.	2015-11-19 09:58:07 +09:00
Junegunn Choi	1fd884b34f	Merge pull request #423 from blueyed/zsh-fzf-completion-localoptions zsh: fzf-completion: use noshwordsplit local option	2015-11-19 00:54:42 +09:00
Daniel Hahler	701687faab	zsh: fzf-completion: use noshwordsplit local option This also fixes the completion causing a bell / flickering in case "shwordsplit" was not set, because then the function would return false.	2015-11-18 16:09:00 +01:00
Junegunn Choi	bbc3055feb	Merge pull request #421 from blueyed/zsh-completion-grep-command zsh completion: use \grep to skip any alias	2015-11-18 03:32:39 +09:00
Daniel Hahler	95c69083c7	zsh completion: use \grep to skip any alias	2015-11-17 18:51:29 +01:00
Junegunn Choi	57a37b5832	[bash-completion] Fix #417 - Update command list	2015-11-12 13:53:36 +09:00
Junegunn Choi	d29ae1c462	[install] Add --32 / --64 options Related: #373	2015-11-12 13:42:56 +09:00
Junegunn Choi	df468fc482	0.11.0	2015-11-10 01:54:53 +09:00
Junegunn Choi	31278bcc68	Fix compatibility issues with OR operator and inverse terms	2015-11-10 01:54:37 +09:00
Junegunn Choi	e7e86b68f4	Add OR operator Close #412	2015-11-09 23:58:53 +09:00
Junegunn Choi	a89d8995c3	Add execute-multi action Close #413	2015-11-09 23:58:19 +09:00
Junegunn Choi	dbc854d5f4	Handle wide unicode characters in --prompt	2015-11-09 22:01:40 +09:00
Junegunn Choi	f1cd0e2daf	[zsh] Fix #404 - Escape $ in $LBUFFER	2015-11-09 12:06:10 +09:00
Junegunn Choi	90d32bd756	[install] Fix #414 - Respect $ZDOTDIR	2015-11-09 01:48:55 +09:00
Junegunn Choi	e99731ea85	[shell] Add FZF_ALT_C_COMMAND for ALT-C (#408 )	2015-11-08 00:12:12 +09:00
Junegunn Choi	15659ac6e6	Merge pull request #409 from freitass/master [bash-completion] Add nvim to f_cmds	2015-11-07 00:23:30 +09:00
Leandro Freitas	3ef41845a9	[bash-completion] Add nvim to f_cmds	2015-11-06 11:22:35 -02:00
Junegunn Choi	c84e681581	Merge pull request #403 from JackDanger/not-relying-on-exit-status-for-ctrl-r Not relying on exit status for CTRL-R Patch submitted by @robinro and @JackDanger Close #403 #242 #241 #203	2015-11-06 08:38:36 +09:00
Jack Danger Canty	c3cf3427b1	Not relying on exit status for CTRL-R In the case that fzf-tmux returns a user-selected result but with a non-zero exit status (which can happen if a function inside $PS1 returns non-zero) this allows CTRL-R to continue working as expected. Addresses #203 (Tranquility's comment)	2015-11-05 10:08:54 -08:00
Junegunn Choi	2c4f71d85b	[zsh] fzf-history-widget - update local declaration	2015-11-04 21:57:18 +09:00
Junegunn Choi	c6328affae	Update extended-search mode section of README	2015-11-04 03:16:36 +09:00
Junegunn Choi	aaef18295d	Update FZF_DEFAULT_COMMAND example	2015-11-04 03:14:38 +09:00
Junegunn Choi	14f0d2035e	Update Homebrew instructions	2015-11-04 03:13:22 +09:00
Junegunn Choi	64afff6b9a	0.10.9	2015-11-03 23:03:49 +09:00
Junegunn Choi	6bddffbca4	Setup signal handlers before ncurses initialization This prevents fzf from missing SIGWINCH during startup which occasionally happens with fzf-tmux	2015-11-03 23:00:34 +09:00
Junegunn Choi	81a88693c1	Make --extended default Close #400	2015-11-03 22:49:32 +09:00
Junegunn Choi	68541e66b7	[man] double-click for --bind (#374 )	2015-11-03 22:40:45 +09:00
Junegunn Choi	672b593634	Update FZF_DEFAULT_COMMAND example (#310 )	2015-11-03 22:25:50 +09:00
Junegunn Choi	5769d3867d	[nvim] setf fzf	2015-10-31 00:18:23 +09:00
Junegunn Choi	724ffa3756	[install] Do not download binary if it's found in $PATH (#373 ) /cc @xconstruct	2015-10-26 12:31:43 +09:00
Junegunn Choi	5694b5ed30	Fix #394 - --bin option is broken	2015-10-23 17:43:34 +09:00
Junegunn Choi	a1184ceb4e	Fix travis CI build	2015-10-23 15:07:16 +09:00
Junegunn Choi	02203c7739	Add command-line flags to install script Close #392 usage: ./install [OPTIONS] --help Show this message --bin Download fzf binary only --all Download fzf binary and update configuration files to enable key bindings and fuzzy completion --[no-]key-bindings Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C) --[no-]completion Enable/disable fuzzy completion (bash & zsh) --[no-]update-rc Whether or not to update shell configuration files	2015-10-23 15:04:32 +09:00
Junegunn Choi	4d709e0dd2	Fix #391 - Strip non-printable characters	2015-10-23 01:12:31 +09:00
Junegunn Choi	ae04f56dbd	Fix --bind "double-click:execute(...)" (#374 )	2015-10-13 02:36:11 +09:00
Junegunn Choi	f80ff8c917	Add bindable double-click event (#374 )	2015-10-13 02:24:38 +09:00
Junegunn Choi	b4ce89bbf5	[build] Link libncursesw when building 64-bit linux binary Close #376	2015-10-12 16:02:08 +09:00
Junegunn Choi	486b87d821	[bash-completion] Retain original completion options (#288 )	2015-10-12 00:27:30 +09:00
Junegunn Choi	b3010a4624	0.10.8	2015-10-09 12:42:07 +09:00
Junegunn Choi	7d53051ec8	Merge pull request #371 from wilywampa/edit_directory Trigger netrw autocommand when opening directory	2015-10-09 12:36:08 +09:00
Jacob Niehus	ed893c5f47	Trigger netrw autocommand when opening directory	2015-10-08 20:28:07 -07:00
Junegunn Choi	a4eb3323da	Fix #370 - Panic when trying to set colors when colors are disabled	2015-10-09 12:16:47 +09:00