0.17.4

Provide an option to reverse items only (#1267 )
Improve preview window update events
2025-07-31 04:02:01 -07:00 · 2018-06-10 10:35:52 +09:00 · 2018-06-10 01:41:50 +09:00 · 2018-06-10 01:40:22 +09:00 · 2018-06-08 19:42:29 +09:00 · 2018-06-02 10:40:33 +09:00
39 changed files with 1027 additions and 266 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -22,7 +22,7 @@
 ### Before submitting

 - Make sure that you have the latest version of fzf
- If you use tmux, make sure $TERM is set to screen or screen-256color
+- If you use tmux, make sure $TERM starts with "screen"
 - For more Vim stuff, check out https://github.com/junegunn/fzf.vim

 Describe your problem or suggestion from here ...
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 bin/fzf
+bin/fzf.exe
 target
 pkg
 Gemfile.lock
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,44 @@
 CHANGELOG
 =========

+0.17.4
+------
+
+- Added `--layout` option with a new layout called `reverse-list`.
+    - `--layout=reverse` is a synonym for `--reverse`
+    - `--layout=default` is a synonym for `--no-reverse`
+- Preview window will be updated even when there is no match for the query
+  if any of the placeholder expressions (e.g. `{q}`, `{+}`) evaluates to
+  a non-empty string.
+- More keys for binding: `shift-{up,down}`, `alt-{up,down,left,right}`
+- fzf can now start even when `/dev/tty` is not available by making an
+  educated guess.
+- Updated the default command for Windows.
+- Fixes and improvements on bash/zsh completion
+- install and uninstall scripts now supports generating files under
+  `XDG_CONFIG_HOME` on `--xdg` flag.
+
+See https://github.com/junegunn/fzf/milestone/12?closed=1 for the full list of
+changes.
+
+0.17.3
+------
+- `$LINES` and `$COLUMNS` are exported to preview command so that the command
+  knows the exact size of the preview window.
+- Better error messages when the default command or `$FZF_DEFAULT_COMMAND`
+  fails.
+- Reverted #1061 to avoid having duplicate entries in the list when find
+  command detected a file system loop (#1120). The default command now
+  requires that find supports `-fstype` option.
+- fzf now distinguishes mouse left click and right click (#1130)
+    - Right click is now bound to `toggle` action by default
+    - `--bind` understands `left-click` and `right-click`
+- Added `replace-query` action (#1137)
+    - Replaces query string with the current selection
+- Added `accept-non-empty` action (#1162)
+    - Same as accept, except that it prevents fzf from exiting without any
+      selection
+
 0.17.1
 ------

--- a/11
+++ b/11
@@ -0,0 +1,11 @@
+FROM archlinux/base:latest
+RUN pacman -Sy && pacman --noconfirm -S awk git tmux zsh fish ruby procps go make
+RUN gem install --no-ri --no-rdoc minitest
+RUN echo '. /usr/share/bash-completion/completions/git' >> ~/.bashrc
+RUN echo '. ~/.bashrc' >> ~/.bash_profile
+
+# Do not set default PS1
+RUN rm -f /etc/bash.bashrc
+COPY . /fzf
+RUN cd /fzf && make install && ./install --all
+CMD tmux new 'set -o pipefail; ruby /fzf/test/test_go.rb | tee out && touch ok' && cat out && [ -e ok ]
--- a/19
+++ b/19
@@ -1,12 +1,5 @@
 ifndef GOOS
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Darwin)
-	GOOS := darwin
-else ifeq ($(UNAME_S),Linux)
-	GOOS := linux
-else
-$(error "$$GOOS is not defined.")
-endif
+GOOS        := $(word 1, $(subst /, " ", $(word 4, $(shell go version))))
 endif

 MAKEFILE    := $(realpath $(lastword $(MAKEFILE_LIST)))
@@ -135,4 +128,12 @@ target/$(BINARYARM8): $(SOURCES) vendor
 bin/fzf: target/$(BINARY) | bin
 	cp -f target/$(BINARY) bin/fzf

-.PHONY: all release release-all test install clean
+docker:
+	docker build -t fzf-arch .
+	docker run -it fzf-arch tmux
+
+docker-test:
+	docker build -t fzf-arch .
+	docker run -it fzf-arch
+
+.PHONY: all release release-all test install clean docker docker-test
--- a/README-VIM.md
+++ b/README-VIM.md
@@ -142,6 +142,28 @@ command! -bang MyStuff
  \ call fzf#run(fzf#wrap('my-stuff', {'dir': '~/my-stuff'}, <bang>0))
 ```

+fzf inside terminal buffer
+--------------------------
+
+The latest versions of Vim and Neovim include builtin terminal emulator
+(`:terminal`) and fzf will start in a terminal buffer in the following cases:
+
+- On Neovim
+- On GVim
+- On Terminal Vim with the non-default layout
+    - `call fzf#run({'left': '30%'})` or `let g:fzf_layout = {'left': '30%'}`
+
+### Hide statusline
+
+When fzf starts in a terminal buffer, you may want to hide the statusline of
+the containing buffer.
+
+```vim
+autocmd! FileType fzf
+autocmd  FileType fzf set laststatus=0 noshowmode noruler
+  \| autocmd BufLeave <buffer> set laststatus=2 showmode ruler
+```
+
 GVim
 ----

--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="https://raw.githubusercontent.com/junegunn/i/master/fzf.png" height="170" alt="fzf - a command-line fuzzy finder"> [![travis-ci](https://travis-ci.org/junegunn/fzf.svg?branch=master)](https://travis-ci.org/junegunn/fzf) [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EKYAW9PGKPD2N)
+<img src="https://raw.githubusercontent.com/junegunn/i/master/fzf.png" height="170" alt="fzf - a command-line fuzzy finder"> [![travis-ci](https://travis-ci.org/junegunn/fzf.svg?branch=master)](https://travis-ci.org/junegunn/fzf)
 ===

 fzf is a general-purpose command-line fuzzy finder.
@@ -23,9 +23,11 @@ Table of Contents
 -----------------

   * [Installation](#installation)
-      * [Using git](#using-git)
      * [Using Homebrew or Linuxbrew](#using-homebrew-or-linuxbrew)
+      * [Using git](#using-git)
      * [As Vim plugin](#as-vim-plugin)
+      * [Arch Linux](#arch-linux)
+      * [Fedora](#fedora)
      * [Windows](#windows)
   * [Upgrading fzf](#upgrading-fzf)
   * [Building fzf](#building-fzf)
@@ -51,7 +53,7 @@ Table of Contents
      * [Executing external programs](#executing-external-programs)
      * [Preview window](#preview-window)
   * [Tips](#tips)
-      * [Respecting .gitignore, <code>.hgignore</code>, and <code>svn:ignore</code>](#respecting-gitignore-hgignore-and-svnignore)
+      * [Respecting .gitignore](#respecting-gitignore)
      * [git ls-tree for fast traversal](#git-ls-tree-for-fast-traversal)
      * [Fish shell](#fish-shell)
   * [<a href="LICENSE">License</a>](#license)
@@ -73,20 +75,10 @@ stuff.

 [bin]: https://github.com/junegunn/fzf-bin/releases

-### Using git
-
-Clone this repository and run
-[install](https://github.com/junegunn/fzf/blob/master/install) script.
-
-```sh
-git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
-~/.fzf/install
-```
-
 ### Using Homebrew or Linuxbrew

-Alternatively, you can use [Homebrew](http://brew.sh/) or
-[Linuxbrew](http://linuxbrew.sh/) to install fzf.
+You can use [Homebrew](http://brew.sh/) or [Linuxbrew](http://linuxbrew.sh/)
+to install fzf.

 ```sh
 brew install fzf
@@ -95,25 +87,70 @@ brew install fzf
 $(brew --prefix)/opt/fzf/install
 ```

+### Using git
+
+Alternatively, you can "git clone" this repository to any directory and run
+[install](https://github.com/junegunn/fzf/blob/master/install) script.
+
+```sh
+git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
+~/.fzf/install
+```
+
 ### As Vim plugin

-You can manually add the directory to `&runtimepath` as follows,
+Once you have fzf installed, you can enable it inside Vim simply by adding the
+directory to `&runtimepath` in your Vim configuration file as follows:

 ```vim
-" If installed using git
-set rtp+=~/.fzf
-
 " If installed using Homebrew
 set rtp+=/usr/local/opt/fzf
+
+" If installed using git
+set rtp+=~/.fzf
 ```

-But it's recommended that you use a plugin manager like
-[vim-plug](https://github.com/junegunn/vim-plug).
+If you use [vim-plug](https://github.com/junegunn/vim-plug), the same can be
+written as:

 ```vim
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+" If installed using Homebrew
+Plug '/usr/local/opt/fzf'
+
+" If installed using git
+Plug '~/.fzf'
 ```

+But instead of separately installing fzf on your system (using Homebrew or
+"git clone") and enabling it on Vim (adding it to `&runtimepath`), you can use
+vim-plug to do both.
+
+```vim
+" PlugInstall and PlugUpdate will clone fzf in ~/.fzf and run install script
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+  " Both options are optional. You don't have to install fzf in ~/.fzf
+  " and you don't have to run install script if you use fzf only in Vim.
+```
+
+### Arch Linux
+
+```sh
+sudo pacman -S fzf
+```
+
+### Fedora
+
+fzf is available in Fedora 26 and above, and can be installed using the usual
+method:
+
+```sh
+sudo dnf install fzf
+```
+
+Shell completion and plugins for vim or neovim are enabled by default. Shell
+key bindings are installed but not enabled by default. See Fedora's package
+documentation (/usr/share/doc/fzf/README.Fedora) for more information.
+
 ### Windows

 Pre-built binaries for Windows can be downloaded [here][bin]. fzf is also
@@ -186,8 +223,8 @@ cursor with `--height` option.
 vim $(fzf --height 40%)
 ```

-Also check out `--reverse` option if you prefer "top-down" layout instead of
-the default "bottom-up" layout.
+Also check out `--reverse` and `--layout` options if you prefer
+"top-down" layout instead of the default "bottom-up" layout.

 ```sh
 vim $(fzf --height 40% --reverse)
@@ -197,7 +234,7 @@ You can add these options to `$FZF_DEFAULT_OPTS` so that they're applied by
 default. For example,

 ```sh
-export FZF_DEFAULT_OPTS='--height 40% --reverse --border'
+export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border'
 ```

 #### Search syntax
@@ -206,14 +243,15 @@ 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
 !fire`

-| 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`         |
-| `!fire`  | inverse-exact-match        | Items that do not include `fire`  |
-| `!.mp3$` | inverse-suffix-exact-match | Items that do not end with `.mp3` |
+| Token     | Match type                 | Description                          |
+| --------- | -------------------------- | ------------------------------------ |
+| `sbtrkt`  | fuzzy-match                | Items that match `sbtrkt`            |
+| `'wild`   | exact-match (quoted)       | Items that include `wild`            |
+| `^music`  | prefix-exact-match         | Items that start with `music`        |
+| `.mp3$`   | suffix-exact-match         | Items that end with `.mp3`           |
+| `!fire`   | inverse-exact-match        | Items that do not include `fire`     |
+| `!^music` | inverse-prefix-exact-match | Items that do not start with `music` |
+| `!.mp3$`  | inverse-suffix-exact-match | Items that do not end with `.mp3`    |

 If you don't prefer fuzzy matching and do not wish to "quote" every word,
 start fzf with `-e` or `--exact` option. Note that when  `--exact` is set,
@@ -231,10 +269,10 @@ or `py`.

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

 #### Options

@@ -369,26 +407,20 @@ export FZF_COMPLETION_TRIGGER='~~'
 # Options to fzf command
 export FZF_COMPLETION_OPTS='+c -x'

-# Use ag instead of the default find command for listing path candidates.
-# - The first argument to the function is the base path to start traversal
+# Use fd (https://github.com/sharkdp/fd) instead of the default find
+# command for listing path candidates.
+# - The first argument to the function ($1) is the base path to start traversal
 # - See the source code (completion.{bash,zsh}) for the details.
-# - ag only lists files, so we use with-dir script to augment the output
 _fzf_compgen_path() {
-  ag -g "" "$1" | with-dir "$1"
+  fd --hidden --follow --exclude ".git" . "$1"
 }

-# Use ag to generate the list for directory completion
+# Use fd to generate the list for directory completion
 _fzf_compgen_dir() {
-  ag -g "" "$1" | only-dir "$1"
+  fd --type d --hidden --follow --exclude ".git" . "$1"
 }
 ```

-`only-dir` and `with-dir` scripts can be found [here][dir-scripts]. They are
-written in Ruby, but you should be able to rewrite them in any language you
-prefer.
-
-[dir-scripts]: https://gist.github.com/junegunn/8c3796a965f22e6a803fe53096ad7a75
-
 #### Supported commands

 On bash, fuzzy completion is enabled only for a predefined set of commands
@@ -489,30 +521,33 @@ For more advanced examples, see [Key bindings for git with fzf][fzf-git].
 Tips
 ----

-#### Respecting `.gitignore`, `.hgignore`, and `svn:ignore`
+#### Respecting `.gitignore`

-[ag](https://github.com/ggreer/the_silver_searcher) or
-[rg](https://github.com/BurntSushi/ripgrep) will do the
-filtering:
+You can use [fd](https://github.com/sharkdp/fd),
+[ripgrep](https://github.com/BurntSushi/ripgrep), or [the silver
+searcher](https://github.com/ggreer/the_silver_searcher) instead of the
+default find command to traverse the file system while respecting
+`.gitignore`.

 ```sh
-# Feed the output of ag into fzf
-ag -g "" | fzf
+# Feed the output of fd into fzf
+fd --type f | fzf

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

-# Now fzf (w/o pipe) will use ag instead of find
+# Now fzf (w/o pipe) will use fd instead of find
 fzf

 # To apply the command to CTRL-T as well
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 ```

-If you don't want to exclude hidden files, use the following command:
+If you want the command to follow symbolic links, and don't want it to exclude
+hidden files, use the following command:

 ```sh
-export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -g ""'
+export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git'
 ```

 #### `git ls-tree` for fast traversal
--- a/bin/fzf-tmux
+++ b/bin/fzf-tmux
@@ -136,6 +136,11 @@ fifo3="${TMPDIR:-/tmp}/fzf-fifo3-$id"
 cleanup() {
  \rm -f $argsf $fifo1 $fifo2 $fifo3

+  # Restore tmux window options
+  if [[ "${#tmux_win_opts[@]}" -gt 0 ]]; then
+    eval "tmux ${tmux_win_opts[@]}"
+  fi
+
  # Remove temp window if we were zoomed
  if [[ -n "$zoomed" ]]; then
    tmux display-message -p "#{window_id}" > /dev/null
@@ -174,6 +179,8 @@ pppid=$$
 echo -n "trap 'kill -SIGUSR1 -$pppid' EXIT SIGINT SIGTERM;" > $argsf
 close="; trap - EXIT SIGINT SIGTERM $close"

+tmux_win_opts=( $(tmux show-window-options remain-on-exit \; show-window-options synchronize-panes | sed '/ off/d; s/^/set-window-option /; s/$/ \\;/') )
+
 if [[ -n "$term" ]] || [[ -t 0 ]]; then
  cat <<< "\"$fzf\" $opts > $fifo2; echo \$? > $fifo3 $close" >> $argsf
  TMUX=$(echo $TMUX | cut -d , -f 1,2) tmux set-window-option synchronize-panes off \;\
--- a/doc/fzf.txt
+++ b/doc/fzf.txt
@@ -1,4 +1,4 @@
-fzf.txt	fzf	Last change: September 29 2017
+fzf.txt	fzf	Last change: November 19 2017
 FZF - TABLE OF CONTENTS                                            *fzf* *fzf-toc*
 ==============================================================================

@@ -8,6 +8,8 @@ FZF - TABLE OF CONTENTS                                            *fzf* *fzf-to
        Examples
    fzf#run
    fzf#wrap
+    fzf inside terminal buffer
+      Hide statusline
    GVim
    License

@@ -167,6 +169,29 @@ function that decorates the options dictionary so that it understands
      \ call fzf#run(fzf#wrap('my-stuff', {'dir': '~/my-stuff'}, <bang>0))
 <

+FZF INSIDE TERMINAL BUFFER                          *fzf-inside-terminal-buffer*
+==============================================================================
+
+The latest versions of Vim and Neovim include builtin terminal emulator
+(`:terminal`) and fzf will start in a terminal buffer in the following cases:
+
+ - On Neovim
+ - On GVim
+ - On Terminal Vim with the non-default layout
+   - `call fzf#run({'left': '30%'})` or `let g:fzf_layout = {'left': '30%'}`
+
+
+< Hide statusline >___________________________________________________________~
+                                                           *fzf-hide-statusline*
+
+When fzf starts in a terminal buffer, you may want to hide the statusline of
+the containing buffer.
+>
+    autocmd! FileType fzf
+    autocmd  FileType fzf set laststatus=0 noshowmode noruler
+      \| autocmd BufLeave <buffer> set laststatus=2 showmode ruler
+<
+
 GVIM                                                                  *fzf-gvim*
 ==============================================================================

--- a/glide.lock
+++ b/glide.lock
@@ -1,24 +1,68 @@
-hash: d68dd0bd779ac4ffca1e0c49ca38d85f90d5d68fa8e2d5d7db70a8ce8c662ec1
-updated: 2017-06-01T15:48:41.653745249-07:00
+hash: 92a208bfbaecdf8d1ccaf99a465884c49f9cd91f44f1756d7bbf3290795c781b
+updated: 2017-12-03T13:37:23.420874333+09:00
 imports:
+- name: github.com/bjwbell/gensimd
+  version: 06eb18285485c0d572cc7f024050fc6cb652ed4c
+  subpackages:
+  - simd
+- name: github.com/codegangsta/cli
+  version: c6af8847eb2b7b297d07c3ede98903e95e680ef9
 - name: github.com/gdamore/encoding
  version: b23993cbb6353f0e6aa98d0ee318a34728f628b9
 - name: github.com/gdamore/tcell
-  version: 44772c121bb7838819d3ba4a7e84c0c2d617328e
+  version: 0a0db94084dfe181108c18508ebd312f12d331fb
  subpackages:
  - encoding
 - name: github.com/lucasb-eyer/go-colorful
  version: c900de9dbbc73129068f5af6a823068fc5f2308c
+- name: github.com/Masterminds/semver
+  version: 15d8430ab86497c5c0da827b748823945e1cf1e1
+- name: github.com/Masterminds/vcs
+  version: 6f1c6d150500e452704e9863f68c2559f58616bf
 - name: github.com/mattn/go-isatty
  version: 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8
 - name: github.com/mattn/go-runewidth
  version: 14207d285c6c197daabb5c9793d63e7af9ab2d50
 - name: github.com/mattn/go-shellwords
  version: 02e3cf038dcea8290e44424da473dd12be796a8a
+- name: github.com/mengzhuo/intrinsic
+  version: 34b800838e0bcd9c5b6abd414e3ad03dc1a686b8
+  subpackages:
+  - sse2
+- name: github.com/mitchellh/go-homedir
+  version: b8bc1bf767474819792c23f32d8286a45736f1c6
 - name: golang.org/x/crypto
  version: e1a4589e7d3ea14a3352255d04b6f1a418845e5e
  subpackages:
+  - acme
+  - blowfish
+  - cast5
+  - chacha20poly1305/internal/chacha20
+  - curve25519
+  - ed25519
+  - ed25519/internal/edwards25519
+  - hkdf
+  - nacl/secretbox
+  - openpgp
+  - openpgp/armor
+  - openpgp/elgamal
+  - openpgp/errors
+  - openpgp/packet
+  - openpgp/s2k
+  - pbkdf2
+  - pkcs12/internal/rc2
+  - poly1305
+  - ripemd160
+  - salsa20/salsa
+  - ssh
+  - ssh/agent
  - ssh/terminal
+  - ssh/testdata
+- name: golang.org/x/net
+  version: a8b9294777976932365dabb6640cf1468d95c70f
+  subpackages:
+  - context
+  - context/ctxhttp
 - name: golang.org/x/sys
  version: b90f89a1e7a9c1f6b918820b3daa7f08488c8594
  subpackages:
@@ -26,13 +70,65 @@ imports:
 - name: golang.org/x/text
  version: 4ee4af566555f5fbe026368b75596286a312663a
  subpackages:
+  - cases
+  - collate
+  - collate/build
+  - currency
  - encoding
  - encoding/charmap
+  - encoding/ianaindex
  - encoding/internal
  - encoding/internal/identifier
  - encoding/japanese
  - encoding/korean
  - encoding/simplifiedchinese
  - encoding/traditionalchinese
+  - encoding/unicode
+  - encoding/unicode/utf32
+  - internal
+  - internal/colltab
+  - internal/format
+  - internal/gen
+  - internal/stringset
+  - internal/tag
+  - internal/testtext
+  - internal/triegen
+  - internal/ucd
+  - internal/utf8internal
+  - language
+  - language/display
+  - message
+  - runes
+  - secure/bidirule
  - transform
-testImports: []
+  - unicode/bidi
+  - unicode/cldr
+  - unicode/norm
+  - unicode/rangetable
+  - width
+- name: golang.org/x/tools
+  version: 04447353bc504b9a5c02eb227b9ecd252e64ea20
+  subpackages:
+  - go/ast/astutil
+  - go/buildutil
+  - go/loader
+- name: gopkg.in/yaml.v2
+  version: 287cf08546ab5e7e37d55a84f7ed3fd1db036de5
+testImports:
+- name: github.com/gopherjs/gopherjs
+  version: 444abdf920945de5d4a977b572bcc6c674d1e4eb
+  subpackages:
+  - js
+- name: github.com/jtolds/gls
+  version: 77f18212c9c7edc9bd6a33d383a7b545ce62f064
+- name: github.com/smartystreets/assertions
+  version: 0b37b35ec7434b77e77a4bb29b79677cced992ea
+  subpackages:
+  - internal/go-render/render
+  - internal/oglematchers
+- name: github.com/smartystreets/goconvey
+  version: e5b2b7c9111590d019a696c7800593f666e1a7f4
+  subpackages:
+  - convey
+  - convey/gotest
+  - convey/reporting
--- a/glide.yaml
+++ b/glide.yaml
@@ -7,7 +7,7 @@ import:
 - package: github.com/mattn/go-shellwords
  version: 02e3cf038dcea8290e44424da473dd12be796a8a
 - package: github.com/gdamore/tcell
-  version: 44772c121bb7838819d3ba4a7e84c0c2d617328e
+  version: 0a0db94084dfe181108c18508ebd312f12d331fb
  subpackages:
  - encoding
 - package: golang.org/x/crypto
--- a/36
+++ b/36
@@ -2,13 +2,16 @@

 set -u

-version=0.17.1
+version=0.17.4
 auto_completion=
 key_bindings=
 update_config=2
 binary_arch=
 allow_legacy=
 shells="bash zsh fish"
+prefix='~/.fzf'
+prefix_expand=~/.fzf
+fish_dir=${XDG_CONFIG_HOME:-$HOME/.config}/fish

 help() {
  cat << EOF
@@ -18,6 +21,7 @@ usage: $0 [OPTIONS]
    --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
+    --xdg                Generate files under \$XDG_CONFIG_HOME/fzf
    --[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
@@ -43,6 +47,11 @@ for opt in "$@"; do
      update_config=1
      allow_legacy=1
      ;;
+    --xdg)
+      prefix='"${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf'
+      prefix_expand=${XDG_CONFIG_HOME:-$HOME/.config}/fzf/fzf
+      mkdir -p "${XDG_CONFIG_HOME:-$HOME/.config}/fzf"
+      ;;
    --key-bindings)    key_bindings=1    ;;
    --no-key-bindings) key_bindings=0    ;;
    --completion)      auto_completion=1 ;;
@@ -69,6 +78,7 @@ fzf_base="$(pwd)"
 ask() {
  while true; do
    read -p "$1 ([y]/n) " -r
+    REPLY=${REPLY:-"y"}
    if [[ $REPLY =~ ^[Yy]$ ]]; then
      return 1
    elif [[ $REPLY =~ ^[Nn]$ ]]; then
@@ -168,13 +178,13 @@ binary_error=""
 case "$archi" in
  Darwin\ *64)   download fzf-$version-darwin_${binary_arch:-amd64}.tgz  ;;
  Darwin\ *86)   download fzf-$version-darwin_${binary_arch:-386}.tgz    ;;
-  Linux\ *64)    download fzf-$version-linux_${binary_arch:-amd64}.tgz   ;;
-  Linux\ *86)    download fzf-$version-linux_${binary_arch:-386}.tgz     ;;
  Linux\ armv5*) download fzf-$version-linux_${binary_arch:-arm5}.tgz    ;;
  Linux\ armv6*) download fzf-$version-linux_${binary_arch:-arm6}.tgz    ;;
  Linux\ armv7*) download fzf-$version-linux_${binary_arch:-arm7}.tgz    ;;
  Linux\ armv8*) download fzf-$version-linux_${binary_arch:-arm8}.tgz    ;;
  Linux\ aarch64*) download fzf-$version-linux_${binary_arch:-arm8}.tgz  ;;
+  Linux\ *64)    download fzf-$version-linux_${binary_arch:-amd64}.tgz   ;;
+  Linux\ *86)    download fzf-$version-linux_${binary_arch:-386}.tgz     ;;
  FreeBSD\ *64)  download fzf-$version-freebsd_${binary_arch:-amd64}.tgz ;;
  FreeBSD\ *86)  download fzf-$version-freebsd_${binary_arch:-386}.tgz   ;;
  OpenBSD\ *64)  download fzf-$version-openbsd_${binary_arch:-amd64}.tgz ;;
@@ -239,8 +249,8 @@ fi
 echo
 for shell in $shells; do
  [[ "$shell" = fish ]] && continue
-  echo -n "Generate ~/.fzf.$shell ... "
-  src=~/.fzf.${shell}
+  src=${prefix_expand}.${shell}
+  echo -n "Generate $src ... "

  fzf_completion="[[ \$- == *i* ]] && source \"$fzf_base/shell/completion.${shell}\" 2> /dev/null"
  if [ $auto_completion -eq 0 ]; then
@@ -252,7 +262,7 @@ for shell in $shells; do
    fzf_key_bindings="# $fzf_key_bindings"
  fi

-  cat > $src << EOF
+  cat > "$src" << EOF
 # Setup fzf
 # ---------
 if [[ ! "\$PATH" == *$fzf_base/bin* ]]; then
@@ -280,13 +290,13 @@ if [[ "$shells" =~ fish ]]; then
 EOF
  [ $? -eq 0 ] && echo "OK" || echo "Failed"

-  mkdir -p ~/.config/fish/functions
-  if [ -e ~/.config/fish/functions/fzf.fish ]; then
-    echo -n "Remove unnecessary ~/.config/fish/functions/fzf.fish ... "
-    rm -f ~/.config/fish/functions/fzf.fish && echo "OK" || echo "Failed"
+  mkdir -p "${fish_dir}/functions"
+  if [ -e "${fish_dir}/functions/fzf.fish" ]; then
+    echo -n "Remove unnecessary ${fish_dir}/functions/fzf.fish ... "
+    rm -f "${fish_dir}/functions/fzf.fish" && echo "OK" || echo "Failed"
  fi

-  fish_binding=~/.config/fish/functions/fzf_key_bindings.fish
+  fish_binding="${fish_dir}/functions/fzf_key_bindings.fish"
  if [ $key_bindings -ne 0 ]; then
    echo -n "Symlink $fish_binding ... "
    ln -sf "$fzf_base/shell/key-bindings.fish" \
@@ -352,11 +362,11 @@ echo
 for shell in $shells; do
  [[ "$shell" = fish ]] && continue
  [ $shell = zsh ] && dest=${ZDOTDIR:-~}/.zshrc || dest=~/.bashrc
-  append_line $update_config "[ -f ~/.fzf.${shell} ] && source ~/.fzf.${shell}" "$dest" "~/.fzf.${shell}"
+  append_line $update_config "[ -f ${prefix}.${shell} ] && source ${prefix}.${shell}" "$dest" "${prefix}.${shell}"
 done

 if [ $key_bindings -eq 1 ] && [[ "$shells" =~ fish ]]; then
-  bind_file=~/.config/fish/functions/fish_user_key_bindings.fish
+  bind_file="${fish_dir}/functions/fish_user_key_bindings.fish"
  if [ ! -e "$bind_file" ]; then
    create_file "$bind_file" \
      'function fish_user_key_bindings' \
--- a/man/man1/fzf-tmux.1
+++ b/man/man1/fzf-tmux.1
@@ -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-tmux 1 "Oct 2017" "fzf 0.17.1" "fzf-tmux - open fzf in tmux split pane"
+.TH fzf-tmux 1 "Jun 2018" "fzf 0.17.4" "fzf-tmux - open fzf in tmux split pane"

 .SH NAME
 fzf-tmux - open fzf in tmux split pane
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -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 2017" "fzf 0.17.1" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Jun 2018" "fzf 0.17.4" "fzf - a command-line fuzzy finder"

 .SH NAME
 fzf - a command-line fuzzy finder
@@ -155,9 +155,22 @@ the full screen.
 .BI "--min-height=" "HEIGHT"
 Minimum height when \fB--height\fR is given in percent (default: 10).
 Ignored when \fB--height\fR is not specified.
+.TP
+.BI "--layout=" "LAYOUT"
+Choose the layout (default: default)
+
+.br
+.BR default "       Display from the bottom of the screen"
+.br
+.BR reverse "       Display from the top of the screen"
+.br
+.BR reverse-list "  Display from the top of the screen, prompt at the bottom"
+.br
+
 .TP
 .B "--reverse"
-Reverse orientation
+A synonym for \fB--layout=reverse\fB
+
 .TP
 .B "--border"
 Draw border above and below the finder
@@ -195,7 +208,7 @@ Input prompt (default: '> ')
 .TP
 .BI "--header=" "STR"
 The given string will be printed as the sticky header. The lines are displayed
-in the given order from top to bottom regardless of \fB--reverse\fR option, and
+in the given order from top to bottom regardless of \fB--layout\fR option, and
 are not affected by \fB--with-nth\fR. ANSI color codes are processed even when
 \fB--ansi\fR is not set.
 .TP
@@ -272,19 +285,28 @@ string, specify field index expressions between the braces (See \fBFIELD INDEX
 EXPRESSION\fR for the details).

 .RS
-e.g. \fBfzf --preview="head -$LINES {}"\fR
+e.g. \fBfzf --preview='head -$LINES {}'\fR
     \fBls -l | fzf --preview="echo user={3} when={-4..-2}; cat {-1}" --header-lines=1\fR

+fzf overrides \fB$LINES\fR and \fB$COLUMNS\fR so that they represent the exact
+size of the preview window.
+
 A placeholder expression starting with \fB+\fR flag will be replaced to the
 space-separated list of the selected lines (or the current line if no selection
 was made) individually quoted.

-e.g. \fBfzf --multi --preview="head -10 {+}"\fR
+e.g. \fBfzf --multi --preview='head -10 {+}'\fR
     \fBgit log --oneline | fzf --multi --preview 'git show {+1}'\fR

+When using a field index expression, leading and trailing whitespace is stripped
+from the replacement string. To preserve the whitespace, use the \fBs\fR flag.
+
 Also, \fB{q}\fR is replaced to the current query string.

 Note that you can escape a placeholder pattern by prepending a backslash.
+
+Preview window will be updated even when there is no match for the current
+query if any of the placeholder expressions evaluates to a non-empty string.
 .RE
 .TP
 .BI "--preview-window=" "[POSITION][:SIZE[%]][:wrap][:hidden]"
@@ -458,6 +480,10 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
    \fIenter\fR       (\fIreturn\fR \fIctrl-m\fR)
    \fIspace\fR
    \fIbspace\fR      (\fIbs\fR)
+    \fIalt-up\fR
+    \fIalt-down\fR
+    \fIalt-left\fR
+    \fIalt-right\fR
    \fIalt-enter\fR
    \fIalt-space\fR
    \fIalt-bspace\fR  (\fIalt-bs\fR)
@@ -474,8 +500,12 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
    \fIend\fR
    \fIpgup\fR        (\fIpage-up\fR)
    \fIpgdn\fR        (\fIpage-down\fR)
+    \fIshift-up\fR
+    \fIshift-down\fR
    \fIshift-left\fR
    \fIshift-right\fR
+    \fIleft-click\fR
+    \fIright-click\fR
    \fIdouble-click\fR
    or any single character

@@ -487,12 +517,13 @@ triggered whenever the query string is changed.
  \fBACTION:               DEFAULT BINDINGS (NOTES):
    \fBabort\fR                 \fIctrl-c  ctrl-g  ctrl-q  esc\fR
    \fBaccept\fR                \fIenter   double-click\fR
+    \fBaccept-non-empty\fR      (same as \fBaccept\fR except that it prevents fzf from exiting without selection)
    \fBbackward-char\fR         \fIctrl-b  left\fR
    \fBbackward-delete-char\fR  \fIctrl-h  bspace\fR
    \fBbackward-kill-word\fR    \fIalt-bs\fR
    \fBbackward-word\fR         \fIalt-b   shift-left\fR
    \fBbeginning-of-line\fR     \fIctrl-a  home\fR
-    \fBcancel\fR
+    \fBcancel\fR                (clears query string if not empty, aborts fzf otherwise)
    \fBclear-screen\fR          \fIctrl-l\fR
    \fBdelete-char\fR           \fIdel\fR
    \fBdelete-char/eof\fR       \fIctrl-d\fR
@@ -514,18 +545,19 @@ triggered whenever the query string is changed.
    \fBpage-up\fR               \fIpgup\fR
    \fBhalf-page-down\fR
    \fBhalf-page-up\fR
-    \fBpreview-down\fR
-    \fBpreview-up\fR
+    \fBpreview-down\fR          \fIshift-down\fR
+    \fBpreview-up\fR            \fIshift-up\fR
    \fBpreview-page-down\fR
    \fBpreview-page-up\fR
    \fBprevious-history\fR      (\fIctrl-p\fR on \fB--history\fR)
    \fBprint-query\fR           (print query and exit)
+    \fBreplace-query\fR         (replace query string with the current selection)
    \fBselect-all\fR
-    \fBtoggle\fR
+    \fBtoggle\fR                (\fIright-click\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-in\fR             (\fB--layout=reverse*\fR ? \fBtoggle+up\fR : \fBtoggle+down\fR)
+    \fBtoggle-out\fR            (\fB--layout=reverse*\fR ? \fBtoggle+down\fR : \fBtoggle+up\fR)
    \fBtoggle-preview\fR
    \fBtoggle-preview-wrap\fR
    \fBtoggle-sort\fR
@@ -576,7 +608,7 @@ fzf switches to the alternate screen when executing a command. However, if the
 command is expected to complete quickly, and you are not interested in its
 output, you might want to use \fBexecute-silent\fR instead, which silently
 executes the command without the switching. Note that fzf will not be
-responsible until the command is complete. For asynchronous execution, start
+responsive until the command is complete. For asynchronous execution, start
 your command as a background process (i.e. appending \fB&\fR).

 .SH AUTHOR
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -50,9 +50,9 @@ if s:is_win
  " Use utf-8 for fzf.vim commands
  " Return array of shell commands for cmd.exe
  function! s:wrap_cmds(cmds)
-    return ['@echo off', 'for /f "tokens=4" %%a in (''chcp'') do set origchcp=%%a', 'chcp 65001 > nul'] +
+    return map(['@echo off', 'for /f "tokens=4" %%a in (''chcp'') do set origchcp=%%a', 'chcp 65001 > nul'] +
          \ (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) +
-          \ ['chcp %origchcp% > nul']
+          \ ['chcp %origchcp% > nul'], 'v:val."\r"')
  endfunction
 else
  let s:term_marker = ";#FZF"
@@ -231,6 +231,7 @@ function! s:common_sink(action, lines) abort
        doautocmd BufEnter
      endif
    endfor
+  catch /^Vim:Interrupt$/
  finally
    let &autochdir = autochdir
    silent! autocmd! fzf_swap
@@ -392,7 +393,7 @@ try
  let has_vim8_term = has('terminal') && has('patch-8.0.995')
  let has_nvim_term = has('nvim-0.2.1') || has('nvim') && !s:is_win
  let use_term = has_nvim_term ||
-    \ has_vim8_term && (has('gui_running') || s:is_win || !use_height && s:present(dict, 'down', 'up', 'left', 'right', 'window'))
+    \ has_vim8_term && !has('win32unix') && (has('gui_running') || s:is_win || !use_height && s:present(dict, 'down', 'up', 'left', 'right', 'window'))
  let use_tmux = (!use_height && !use_term || prefer_tmux) && !has('win32unix') && s:tmux_enabled() && s:splittable(dict)
  if prefer_tmux && use_tmux
    let use_height = 0
@@ -586,7 +587,7 @@ function! s:calc_size(max, val, dict)
    let srcsz = len(a:dict.source)
  endif

-  let opts = get(a:dict, 'options', '').$FZF_DEFAULT_OPTS
+  let opts = s:evaluate_opts(get(a:dict, 'options', '')).$FZF_DEFAULT_OPTS
  let margin = stridx(opts, '--inline-info') > stridx(opts, '--no-inline-info') ? 1 : 2
  let margin += stridx(opts, '--header') > stridx(opts, '--no-header')
  return srcsz >= 0 ? min([srcsz + margin, size]) : size
@@ -699,10 +700,9 @@ function! s:execute_term(dict, command, temps) abort
    if has('nvim')
      call termopen(command, fzf)
    else
-      let t = term_start([&shell, &shellcmdflag, command], {'curwin': fzf.buf, 'exit_cb': function(fzf.on_exit)})
-      " FIXME: https://github.com/vim/vim/issues/1998
-      if !has('nvim') && !s:is_win
-        call term_wait(t, 20)
+      let fzf.buf = term_start([&shell, &shellcmdflag, command], {'curwin': 1, 'exit_cb': function(fzf.on_exit)})
+      if !has('patch-8.0.1261') && !has('nvim') && !s:is_win
+        call term_wait(fzf.buf, 20)
      endif
    endif
  finally
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -1,4 +1,3 @@
-#!/bin/bash
 #     ____      ____
 #    / __/___  / __/
 #   / /_/_  / / /_
@@ -38,9 +37,9 @@ __fzfcmd_complete() {
    echo "fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}" || echo "fzf"
 }

-_fzf_orig_completion_filter() {
-  sed 's/^\(.*-F\) *\([^ ]*\).* \([^ ]*\)$/export _fzf_orig_completion_\3="\1 %s \3 #\2";/' |
-  awk -F= '{gsub(/[^A-Za-z0-9_= ;]/, "_", $1); print $1"="$2}'
+__fzf_orig_completion_filter() {
+  sed 's/^\(.*-F\) *\([^ ]*\).* \([^ ]*\)$/export _fzf_orig_completion_\3="\1 %s \3 #\2"; [[ "\1" = *" -o nospace "* ]] \&\& [[ ! "$__fzf_nospace_commands" = *" \3 "* ]] \&\& __fzf_nospace_commands="$__fzf_nospace_commands \3 ";/' |
+  awk -F= '{OFS = FS} {gsub(/[^A-Za-z0-9_= ;]/, "_", $1);}1'
 }

 _fzf_opts_completion() {
@@ -113,7 +112,7 @@ _fzf_opts_completion() {
 }

 _fzf_handle_dynamic_completion() {
-  local cmd orig_var orig ret orig_cmd
+  local cmd orig_var orig ret orig_cmd orig_complete
  cmd="$1"
  shift
  orig_cmd="$1"
@@ -122,10 +121,18 @@ _fzf_handle_dynamic_completion() {
  if [ -n "$orig" ] && type "$orig" > /dev/null 2>&1; then
    $orig "$@"
  elif [ -n "$_fzf_completion_loader" ]; then
+    orig_complete=$(complete -p "$cmd" 2> /dev/null)
    _completion_loader "$@"
    ret=$?
-    eval "$(complete | command grep "\-F.* $orig_cmd$" | _fzf_orig_completion_filter)"
-    source "${BASH_SOURCE[0]}"
+    # _completion_loader may not have updated completion for the command
+    if [ "$(complete -p "$cmd" 2> /dev/null)" != "$orig_complete" ]; then
+      eval "$(complete | command grep " -F.* $orig_cmd$" | __fzf_orig_completion_filter)"
+      if [[ "$__fzf_nospace_commands" = *" $orig_cmd "* ]]; then
+        eval "${orig_complete/ -F / -o nospace -F }"
+      else
+        eval "$orig_complete"
+      fi
+    fi
    return $ret
  fi
 }
@@ -141,7 +148,7 @@ __fzf_generic_path_completion() {
    base=${cur:0:${#cur}-${#trigger}}
    eval "base=$base"

-    dir="$base"
+    [[ $base = *"/"* ]] && dir="$base"
    while true; do
      if [ -z "$dir" ] || [ -d "$dir" ]; then
        leftover=${base/#"$dir"}
@@ -152,6 +159,7 @@ __fzf_generic_path_completion() {
          printf "%q$3 " "$item"
        done)
        matches=${matches% }
+        [[ -z "$3" ]] && [[ "$__fzf_nospace_commands" = *" ${COMP_WORDS[0]} "* ]] && matches="$matches "
        if [ -n "$matches" ]; then
          COMPREPLY=( "$matches" )
        else
@@ -215,7 +223,7 @@ _fzf_complete_kill() {

  local selected fzf
  fzf="$(__fzfcmd_complete)"
-  selected=$(ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ')
+  selected=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" $fzf -m | awk '{print $2}' | tr '\n' ' ')
  printf '\e[5n'

  if [ -n "$selected" ]; then
@@ -234,7 +242,7 @@ _fzf_complete_telnet() {
 _fzf_complete_ssh() {
  _fzf_complete '+m' "$@" < <(
    cat <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | command grep -i '^host' | command grep -v '*' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}') \
-        <(command grep -oE '^[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | awk '{ print $1 " " $1 }') \
+        <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \
        <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') |
        awk '{if (length($2) > 0) {print $2}}' | sort -u
  )
@@ -274,9 +282,9 @@ a_cmds="
 x_cmds="kill ssh telnet unset unalias export"

 # Preserve existing completion
-eval $(complete |
+eval "$(complete |
  sed -E '/-F/!d; / _fzf/d; '"/ ($(echo $d_cmds $a_cmds $x_cmds | sed 's/ /|/g; s/+/\\+/g'))$/"'!d' |
-  _fzf_orig_completion_filter)
+  __fzf_orig_completion_filter)"

 if type _completion_loader > /dev/null 2>&1; then
  _fzf_completion_loader=1
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -1,4 +1,3 @@
-#!/bin/zsh
 #     ____      ____
 #    / __/___  / __/
 #   / /_/_  / / /_
@@ -37,8 +36,7 @@ __fzfcmd_complete() {

 __fzf_generic_path_completion() {
  local base lbuf compgen fzf_opts suffix tail fzf dir leftover matches
-  # (Q) flag removes a quoting level: "foo\ bar" => "foo bar"
-  base=${(Q)1}
+  base=$1
  lbuf=$2
  compgen=$3
  fzf_opts=$4
@@ -47,14 +45,14 @@ __fzf_generic_path_completion() {
  fzf="$(__fzfcmd_complete)"

  setopt localoptions nonomatch
-  dir="$base"
+  eval "base=$base"
+  [[ $base = *"/"* ]] && dir="$base"
  while [ 1 ]; do
-    if [[ -z "$dir" || -d ${~dir} ]]; then
+    if [[ -z "$dir" || -d ${dir} ]]; then
      leftover=${base/#"$dir"}
      leftover=${leftover/#\/}
      [ -z "$dir" ] && dir='.'
      [ "$dir" != "/" ] && dir="${dir/%\//}"
-      dir=${~dir}
      matches=$(eval "$compgen $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS" ${=fzf} ${=fzf_opts} -q "$leftover" | while read item; do
        echo -n "${(q)item}$suffix "
      done)
@@ -117,7 +115,7 @@ _fzf_complete_telnet() {
 _fzf_complete_ssh() {
  _fzf_complete '+m' "$@" < <(
    command cat <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | command grep -i '^host' | command grep -v '*' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}') \
-        <(command grep -oE '^[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | awk '{ print $1 " " $1 }') \
+        <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \
        <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') |
        awk '{if (length($2) > 0) {print $2}}' | sort -u
  )
@@ -163,7 +161,7 @@ fzf-completion() {
  # Kill completion (do not require trigger sequence)
  if [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then
    fzf="$(__fzfcmd_complete)"
-    matches=$(ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' ' ')
+    matches=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${=fzf} -m | awk '{print $2}' | tr '\n' ' ')
    if [ -n "$matches" ]; then
      LBUFFER="$LBUFFER$matches"
    fi
--- a/shell/key-bindings.bash
+++ b/shell/key-bindings.bash
@@ -56,7 +56,7 @@ __fzf_history__() (
  shopt -u nocaseglob nocasematch
  line=$(
    HISTTIMEFORMAT= history |
-    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS --tac -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS +m" $(__fzfcmd) |
+    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS --tac --sync -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS +m" $(__fzfcmd) |
    command grep '^ *[0-9]') &&
    if [[ $- =~ H ]]; then
      sed 's/^ *\([0-9]*\)\** .*/!\1/' <<< "$line"
@@ -80,7 +80,7 @@ if [[ ! -o vi ]]; then
  fi

  # CTRL-R - Paste the selected command from history into the command line
-  bind '"\C-r": " \C-e\C-u`__fzf_history__`\e\C-e\e^\er"'
+  bind '"\C-r": " \C-e\C-u\C-y\ey\C-u`__fzf_history__`\e\C-e\er\e^"'

  # ALT-C - cd into the selected directory
  bind '"\ec": " \C-e\C-u`__fzf_cd__`\e\C-e\er\C-m"'
@@ -110,7 +110,7 @@ else
  bind -m vi-command '"\C-t": "i\C-t"'

  # CTRL-R - Paste the selected command from history into the command line
-  bind '"\C-r": "\C-x\C-addi`__fzf_history__`\C-x\C-e\C-x^\C-x\C-a$a\C-x\C-r"'
+  bind '"\C-r": "\C-x\C-addi`__fzf_history__`\C-x\C-e\C-x\C-r\C-x^\C-x\C-a$a"'
  bind -m vi-command '"\C-r": "i\C-r"'

  # ALT-C - cd into the selected directory
--- a/shell/key-bindings.zsh
+++ b/shell/key-bindings.zsh
@@ -36,6 +36,16 @@ fzf-file-widget() {
 zle     -N   fzf-file-widget
 bindkey '^T' fzf-file-widget

+# Ensure precmds are run after cd
+fzf-redraw-prompt() {
+  local precmd
+  for precmd in $precmd_functions; do
+    $precmd
+  done
+  zle reset-prompt
+}
+zle -N fzf-redraw-prompt
+
 # ALT-C - cd into the selected directory
 fzf-cd-widget() {
  local cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
@@ -48,7 +58,7 @@ fzf-cd-widget() {
  fi
  cd "$dir"
  local ret=$?
-  zle reset-prompt
+  zle fzf-redraw-prompt
  typeset -f zle-line-init >/dev/null && zle zle-line-init
  return $ret
 }
@@ -59,8 +69,8 @@ bindkey '\ec' fzf-cd-widget
 fzf-history-widget() {
  local selected num
  setopt localoptions noglobsubst noposixbuiltins pipefail 2> /dev/null
-  selected=( $(fc -l 1 |
-    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS --tac -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
+  selected=( $(fc -rl 1 |
+    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
  local ret=$?
  if [ -n "$selected" ]; then
    num=$selected[1]
--- a/src/ansi_test.go
+++ b/src/ansi_test.go
@@ -26,7 +26,7 @@ func TestExtractColor(t *testing.T) {
 		output, ansiOffsets, newState := extractColor(src, state, nil)
 		state = newState
 		if output != "hello world" {
-			t.Errorf("Invalid output: %s %s", output, []rune(output))
+			t.Errorf("Invalid output: %s %v", output, []rune(output))
 		}
 		fmt.Println(src, ansiOffsets, clean)
 		assertion(ansiOffsets, state)
--- a/src/constants.go
+++ b/src/constants.go
@@ -9,7 +9,7 @@ import (

 const (
 	// Current version
-	version = "0.17.1"
+	version = "0.17.4"

 	// Core
 	coordinatorDelayMax  time.Duration = 100 * time.Millisecond
@@ -55,11 +55,11 @@ var defaultCommand string

 func init() {
 	if !util.IsWindows() {
-		defaultCommand = `set -o pipefail; (command find -L . -mindepth 1 \( -path '*/\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \) -prune -o -type f -print -o -type l -print || command find -L . -mindepth 1 -path '*/\.*' -prune -o -type f -print -o -type l -print) 2> /dev/null | cut -b3-`
+		defaultCommand = `set -o pipefail; command find -L . -mindepth 1 \( -path '*/\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \) -prune -o -type f -print -o -type l -print 2> /dev/null | cut -b3-`
 	} else if os.Getenv("TERM") == "cygwin" {
 		defaultCommand = `sh -c "command find -L . -mindepth 1 -path '*/\.*' -prune -o -type f -print -o -type l -print 2> /dev/null | cut -b3-"`
 	} else {
-		defaultCommand = `dir /s/b`
+		defaultCommand = `for /r %P in (*) do @(set "_curfile=%P" & set "_curfile=!_curfile:%__CD__%=!" & echo !_curfile!)`
 	}
 }

--- a/src/options.go
+++ b/src/options.go
@@ -53,7 +53,7 @@ const usage = `usage: fzf [options]
                          height instead of using fullscreen
    --min-height=HEIGHT   Minimum height when --height is given in percent
                          (default: 10)
-    --reverse             Reverse orientation
+    --layout=LAYOUT       Choose layout: [default|reverse|reverse-list]
    --border              Draw border above and below the finder
    --margin=MARGIN       Screen margin (TRBL / TB,RL / T,RL,B / T,R,B,L)
    --inline-info         Display finder info inline with the query
@@ -90,7 +90,8 @@ const usage = `usage: fzf [options]

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

 `

@@ -132,6 +133,14 @@ const (
 	posRight
 )

+type layoutType int
+
+const (
+	layoutDefault layoutType = iota
+	layoutReverse
+	layoutReverseList
+)
+
 type previewOpts struct {
 	command  string
 	position windowPosition
@@ -161,7 +170,7 @@ type Options struct {
 	Bold        bool
 	Height      sizeSpec
 	MinHeight   int
-	Reverse     bool
+	Layout      layoutType
 	Cycle       bool
 	Hscroll     bool
 	HscrollOff  int
@@ -211,7 +220,7 @@ func defaultOptions() *Options {
 		Black:       false,
 		Bold:        true,
 		MinHeight:   10,
-		Reverse:     false,
+		Layout:      layoutDefault,
 		Cycle:       false,
 		Hscroll:     true,
 		HscrollOff:  10,
@@ -410,6 +419,14 @@ func parseKeyChords(str string, message string) map[int]string {
 			chord = tui.AltSlash
 		case "alt-bs", "alt-bspace":
 			chord = tui.AltBS
+		case "alt-up":
+			chord = tui.AltUp
+		case "alt-down":
+			chord = tui.AltDown
+		case "alt-left":
+			chord = tui.AltLeft
+		case "alt-right":
+			chord = tui.AltRight
 		case "tab":
 			chord = tui.Tab
 		case "btab", "shift-tab":
@@ -426,10 +443,18 @@ func parseKeyChords(str string, message string) map[int]string {
 			chord = tui.PgUp
 		case "pgdn", "page-down":
 			chord = tui.PgDn
+		case "shift-up":
+			chord = tui.SUp
+		case "shift-down":
+			chord = tui.SDown
 		case "shift-left":
 			chord = tui.SLeft
 		case "shift-right":
 			chord = tui.SRight
+		case "left-click":
+			chord = tui.LeftClick
+		case "right-click":
+			chord = tui.RightClick
 		case "double-click":
 			chord = tui.DoubleClick
 		case "f10":
@@ -658,8 +683,12 @@ func parseKeymap(keymap map[int][]action, str string) {
 				appendAction(actAbort)
 			case "accept":
 				appendAction(actAccept)
+			case "accept-non-empty":
+				appendAction(actAcceptNonEmpty)
 			case "print-query":
 				appendAction(actPrintQuery)
+			case "replace-query":
+				appendAction(actReplaceQuery)
 			case "backward-char":
 				appendAction(actBackwardChar)
 			case "backward-delete-char":
@@ -837,6 +866,20 @@ func parseHeight(str string) sizeSpec {
 	return size
 }

+func parseLayout(str string) layoutType {
+	switch str {
+	case "default":
+		return layoutDefault
+	case "reverse":
+		return layoutReverse
+	case "reverse-list":
+		return layoutReverseList
+	default:
+		errorExit("invalid layout (expected: default / reverse / reverse-list)")
+	}
+	return layoutDefault
+}
+
 func parsePreviewWindow(opts *previewOpts, input string) {
 	// Default
 	opts.position = posRight
@@ -1017,10 +1060,13 @@ func parseOptions(opts *Options, allArgs []string) {
 			opts.Bold = true
 		case "--no-bold":
 			opts.Bold = false
+		case "--layout":
+			opts.Layout = parseLayout(
+				nextString(allArgs, &i, "layout required (default / reverse / reverse-list)"))
 		case "--reverse":
-			opts.Reverse = true
+			opts.Layout = layoutReverse
 		case "--no-reverse":
-			opts.Reverse = false
+			opts.Layout = layoutDefault
 		case "--cycle":
 			opts.Cycle = true
 		case "--no-cycle":
@@ -1136,6 +1182,8 @@ func parseOptions(opts *Options, allArgs []string) {
 				opts.Height = parseHeight(value)
 			} else if match, value := optString(arg, "--min-height="); match {
 				opts.MinHeight = atoi(value)
+			} else if match, value := optString(arg, "--layout="); match {
+				opts.Layout = parseLayout(value)
 			} else if match, value := optString(arg, "--toggle-sort="); match {
 				parseToggleSort(opts.Keymap, value)
 			} else if match, value := optString(arg, "--expect="); match {
--- a/src/options_test.go
+++ b/src/options_test.go
@@ -50,7 +50,7 @@ func TestDelimiterRegexString(t *testing.T) {
 		tokens[2].text.ToString() != "---*" ||
 		tokens[3].text.ToString() != "*" ||
 		tokens[4].text.ToString() != "---" {
-		t.Errorf("%s %s %d", delim, tokens, len(tokens))
+		t.Errorf("%s %v %d", delim, tokens, len(tokens))
 	}
 }

@@ -71,7 +71,7 @@ func TestSplitNth(t *testing.T) {
 		if len(ranges) != 1 ||
 			ranges[0].begin != rangeEllipsis ||
 			ranges[0].end != rangeEllipsis {
-			t.Errorf("%s", ranges)
+			t.Errorf("%v", ranges)
 		}
 	}
 	{
@@ -87,7 +87,7 @@ func TestSplitNth(t *testing.T) {
 			ranges[7].begin != -2 || ranges[7].end != -2 ||
 			ranges[8].begin != 2 || ranges[8].end != -2 ||
 			ranges[9].begin != rangeEllipsis || ranges[9].end != rangeEllipsis {
-			t.Errorf("%s", ranges)
+			t.Errorf("%v", ranges)
 		}
 	}
 }
@@ -99,7 +99,7 @@ func TestIrrelevantNth(t *testing.T) {
 		parseOptions(opts, words)
 		postProcessOptions(opts)
 		if len(opts.Nth) != 0 {
-			t.Errorf("nth should be empty: %s", opts.Nth)
+			t.Errorf("nth should be empty: %v", opts.Nth)
 		}
 	}
 	for _, words := range [][]string{[]string{"--nth", "..,3", "+x"}, []string{"--nth", "3,1..", "+x"}, []string{"--nth", "..-1,1", "+x"}} {
@@ -108,7 +108,7 @@ func TestIrrelevantNth(t *testing.T) {
 			parseOptions(opts, words)
 			postProcessOptions(opts)
 			if len(opts.Nth) != 0 {
-				t.Errorf("nth should be empty: %s", opts.Nth)
+				t.Errorf("nth should be empty: %v", opts.Nth)
 			}
 		}
 		{
@@ -117,7 +117,7 @@ func TestIrrelevantNth(t *testing.T) {
 			parseOptions(opts, words)
 			postProcessOptions(opts)
 			if len(opts.Nth) != 2 {
-				t.Errorf("nth should not be empty: %s", opts.Nth)
+				t.Errorf("nth should not be empty: %v", opts.Nth)
 			}
 		}
 	}
--- a/src/pattern.go
+++ b/src/pattern.go
@@ -1,6 +1,7 @@
 package fzf

 import (
+	"fmt"
 	"regexp"
 	"strings"

@@ -34,6 +35,11 @@ type term struct {
 	caseSensitive bool
 }

+// String returns the string representation of a term.
+func (t term) String() string {
+	return fmt.Sprintf("term{typ: %d, inv: %v, text: []rune(%q), caseSensitive: %v}", t.typ, t.inv, string(t.text), t.caseSensitive)
+}
+
 type termSet []term

 // Pattern represents search pattern
--- a/src/pattern_test.go
+++ b/src/pattern_test.go
@@ -31,12 +31,12 @@ func TestParseTermsExtended(t *testing.T) {
 		terms[8][1].typ != termExact || terms[8][1].inv ||
 		terms[8][2].typ != termSuffix || terms[8][2].inv ||
 		terms[8][3].typ != termExact || !terms[8][3].inv {
-		t.Errorf("%s", terms)
+		t.Errorf("%v", terms)
 	}
 	for _, termSet := range terms[:8] {
 		term := termSet[0]
 		if len(term.text) != 3 {
-			t.Errorf("%s", term)
+			t.Errorf("%v", term)
 		}
 	}
 }
@@ -53,14 +53,14 @@ func TestParseTermsExtendedExact(t *testing.T) {
 		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)
+		t.Errorf("%v", terms)
 	}
 }

 func TestParseTermsEmpty(t *testing.T) {
 	terms := parseTerms(true, CaseSmart, false, "' ^ !' !^")
 	if len(terms) != 0 {
-		t.Errorf("%s", terms)
+		t.Errorf("%v", terms)
 	}
 }

@@ -73,7 +73,7 @@ func TestExact(t *testing.T) {
 	res, pos := algo.ExactMatchNaive(
 		pattern.caseSensitive, pattern.normalize, pattern.forward, &chars, pattern.termSets[0][0].text, true, nil)
 	if res.Start != 7 || res.End != 10 {
-		t.Errorf("%s / %d / %d", pattern.termSets, res.Start, res.End)
+		t.Errorf("%v / %d / %d", pattern.termSets, res.Start, res.End)
 	}
 	if pos != nil {
 		t.Errorf("pos is expected to be nil")
@@ -90,7 +90,7 @@ func TestEqual(t *testing.T) {
 		res, pos := algo.EqualMatch(
 			pattern.caseSensitive, pattern.normalize, pattern.forward, &chars, pattern.termSets[0][0].text, true, nil)
 		if res.Start != sidxExpected || res.End != eidxExpected {
-			t.Errorf("%s / %d / %d", pattern.termSets, res.Start, res.End)
+			t.Errorf("%v / %d / %d", pattern.termSets, res.Start, res.End)
 		}
 		if pos != nil {
 			t.Errorf("pos is expected to be nil")
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -24,7 +24,7 @@ import (
 var placeholder *regexp.Regexp

 func init() {
-	placeholder = regexp.MustCompile("\\\\?(?:{\\+?[0-9,-.]*}|{q})")
+	placeholder = regexp.MustCompile("\\\\?(?:{[+s]*[0-9,-.]*}|{q})")
 }

 type jumpMode int
@@ -59,7 +59,7 @@ type Terminal struct {
 	inlineInfo bool
 	prompt     string
 	promptLen  int
-	reverse    bool
+	layout     layoutType
 	fullscreen bool
 	hscroll    bool
 	hscrollOff int
@@ -170,6 +170,7 @@ const (
 	actBeginningOfLine
 	actAbort
 	actAccept
+	actAcceptNonEmpty
 	actBackwardChar
 	actBackwardDeleteChar
 	actBackwardWord
@@ -203,6 +204,7 @@ const (
 	actJump
 	actJumpAccept
 	actPrintQuery
+	actReplaceQuery
 	actToggleSort
 	actTogglePreview
 	actTogglePreviewWrap
@@ -219,6 +221,12 @@ const (
 	actTop
 )

+type placeholderFlags struct {
+	plus          bool
+	preserveSpace bool
+	query         bool
+}
+
 func toActions(types ...actionType) []action {
 	actions := make([]action, len(types))
 	for idx, t := range types {
@@ -275,9 +283,14 @@ func defaultKeymap() map[int][]action {
 	keymap[tui.PgUp] = toActions(actPageUp)
 	keymap[tui.PgDn] = toActions(actPageDown)

+	keymap[tui.SUp] = toActions(actPreviewUp)
+	keymap[tui.SDown] = toActions(actPreviewDown)
+
 	keymap[tui.Rune] = toActions(actRune)
 	keymap[tui.Mouse] = toActions(actMouse)
 	keymap[tui.DoubleClick] = toActions(actAccept)
+	keymap[tui.LeftClick] = toActions(actIgnore)
+	keymap[tui.RightClick] = toActions(actToggle)
 	return keymap
 }

@@ -289,10 +302,11 @@ func trimQuery(query string) []rune {
 func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 	input := trimQuery(opts.Query)
 	var header []string
-	if opts.Reverse {
-		header = opts.Header
-	} else {
+	switch opts.Layout {
+	case layoutDefault, layoutReverseList:
 		header = reverseStringArray(opts.Header)
+	default:
+		header = opts.Header
 	}
 	var delay time.Duration
 	if opts.Tac {
@@ -350,7 +364,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 	t := Terminal{
 		initDelay:  delay,
 		inlineInfo: opts.InlineInfo,
-		reverse:    opts.Reverse,
+		layout:     opts.Layout,
 		fullscreen: fullscreen,
 		hscroll:    opts.Hscroll,
 		hscrollOff: opts.HscrollOff,
@@ -630,8 +644,21 @@ func (t *Terminal) resizeWindows() {
 }

 func (t *Terminal) move(y int, x int, clear bool) {
-	if !t.reverse {
-		y = t.window.Height() - y - 1
+	h := t.window.Height()
+
+	switch t.layout {
+	case layoutDefault:
+		y = h - y - 1
+	case layoutReverseList:
+		n := 2 + len(t.header)
+		if t.inlineInfo {
+			n--
+		}
+		if y < n {
+			y = h - y - 1
+		} else {
+			y -= n
+		}
 	}

 	if clear {
@@ -691,7 +718,11 @@ func (t *Terminal) printInfo() {
 		output += fmt.Sprintf(" (%d%%)", t.progress)
 	}
 	if !t.success && t.count == 0 {
-		output += " [ERROR]"
+		if len(os.Getenv("FZF_DEFAULT_COMMAND")) > 0 {
+			output = "[$FZF_DEFAULT_COMMAND failed]"
+		} else {
+			output = "[default command failed - $FZF_DEFAULT_COMMAND required]"
+		}
 	}
 	if pos+len(output) <= t.window.Width() {
 		t.window.CPrint(tui.ColInfo, 0, output)
@@ -731,7 +762,7 @@ func (t *Terminal) printList() {
 	count := t.merger.Length() - t.offset
 	for j := 0; j < maxy; j++ {
 		i := j
-		if !t.reverse {
+		if t.layout == layoutDefault {
 			i = maxy - 1 - j
 		}
 		line := i + 2 + len(t.header)
@@ -1119,16 +1150,46 @@ func quoteEntry(entry string) string {
 	return "'" + strings.Replace(entry, "'", "'\\''", -1) + "'"
 }

-func hasPlusFlag(template string) bool {
-	for _, match := range placeholder.FindAllString(template, -1) {
-		if match[0] == '\\' {
-			continue
-		}
-		if match[1] == '+' {
-			return true
+func parsePlaceholder(match string) (bool, string, placeholderFlags) {
+	flags := placeholderFlags{}
+
+	if match[0] == '\\' {
+		// Escaped placeholder pattern
+		return true, match[1:], flags
+	}
+
+	skipChars := 1
+	for _, char := range match[1:] {
+		switch char {
+		case '+':
+			flags.plus = true
+			skipChars++
+		case 's':
+			flags.preserveSpace = true
+			skipChars++
+		case 'q':
+			flags.query = true
+		default:
+			break
 		}
 	}
-	return false
+
+	matchWithoutFlags := "{" + match[skipChars:]
+
+	return false, matchWithoutFlags, flags
+}
+
+func hasPreviewFlags(template string) (plus bool, query bool) {
+	for _, match := range placeholder.FindAllString(template, -1) {
+		_, _, flags := parsePlaceholder(match)
+		if flags.plus {
+			plus = true
+		}
+		if flags.query {
+			query = true
+		}
+	}
+	return
 }

 func replacePlaceholder(template string, stripAnsi bool, delimiter Delimiter, forcePlus bool, query string, allItems []*Item) string {
@@ -1141,9 +1202,10 @@ func replacePlaceholder(template string, stripAnsi bool, delimiter Delimiter, fo
 		selected = []*Item{}
 	}
 	return placeholder.ReplaceAllStringFunc(template, func(match string) string {
-		// Escaped pattern
-		if match[0] == '\\' {
-			return match[1:]
+		escaped, match, flags := parsePlaceholder(match)
+
+		if escaped {
+			return match
 		}

 		// Current query
@@ -1151,13 +1213,8 @@ func replacePlaceholder(template string, stripAnsi bool, delimiter Delimiter, fo
 			return quoteEntry(query)
 		}

-		plusFlag := forcePlus
-		if match[1] == '+' {
-			match = "{" + match[2:]
-			plusFlag = true
-		}
 		items := current
-		if plusFlag {
+		if flags.plus || forcePlus {
 			items = selected
 		}

@@ -1193,7 +1250,9 @@ func replacePlaceholder(template string, stripAnsi bool, delimiter Delimiter, fo
 					str = str[:delims[len(delims)-1][0]]
 				}
 			}
-			str = strings.TrimSpace(str)
+			if !flags.preserveSpace {
+				str = strings.TrimSpace(str)
+			}
 			replacements[idx] = quoteEntry(str)
 		}
 		return strings.Join(replacements, " ")
@@ -1249,13 +1308,28 @@ func (t *Terminal) currentItem() *Item {

 func (t *Terminal) buildPlusList(template string, forcePlus bool) (bool, []*Item) {
 	current := t.currentItem()
-	if !forcePlus && !hasPlusFlag(template) || len(t.selected) == 0 {
+	plus, query := hasPreviewFlags(template)
+	if !(query && len(t.input) > 0 || (forcePlus || plus) && len(t.selected) > 0) {
 		return current != nil, []*Item{current, current}
 	}
-	sels := make([]*Item, len(t.selected)+1)
-	sels[0] = current
-	for i, sel := range t.sortSelected() {
-		sels[i+1] = sel.item
+
+	// We would still want to update preview window even if there is no match if
+	//   1. command template contains {q} and the query string is not empty
+	//   2. or it contains {+} and we have more than one item already selected.
+	// To do so, we pass an empty Item instead of nil to trigger an update.
+	if current == nil {
+		current = &Item{}
+	}
+
+	var sels []*Item
+	if len(t.selected) == 0 {
+		sels = []*Item{current, current}
+	} else {
+		sels = make([]*Item, len(t.selected)+1)
+		sels[0] = current
+		for i, sel := range t.sortSelected() {
+			sels[i+1] = sel.item
+		}
 	}
 	return true, sels
 }
@@ -1362,6 +1436,12 @@ func (t *Terminal) Loop() {
 					command := replacePlaceholder(t.preview.command,
 						t.ansi, t.delimiter, false, string(t.input), request)
 					cmd := util.ExecCommand(command)
+					if t.pwindow != nil {
+						env := os.Environ()
+						env = append(env, fmt.Sprintf("LINES=%d", t.pwindow.Height()))
+						env = append(env, fmt.Sprintf("COLUMNS=%d", t.pwindow.Width()))
+						cmd.Env = env
+					}
 					out, _ := cmd.CombinedOutput()
 					t.reqBox.Set(reqPreviewDisplay, string(out))
 				} else {
@@ -1556,6 +1636,11 @@ func (t *Terminal) Loop() {
 				}
 			case actPrintQuery:
 				req(reqPrintQuery)
+			case actReplaceQuery:
+				if t.cy >= 0 && t.cy < t.merger.Length() {
+					t.input = t.merger.Get(t.cy).item.text.ToRunes()
+					t.cx = len(t.input)
+				}
 			case actAbort:
 				req(reqQuit)
 			case actDeleteChar:
@@ -1609,12 +1694,12 @@ func (t *Terminal) Loop() {
 					req(reqList, reqInfo)
 				}
 			case actToggleIn:
-				if t.reverse {
+				if t.layout != layoutDefault {
 					return doAction(action{t: actToggleUp}, mapkey)
 				}
 				return doAction(action{t: actToggleDown}, mapkey)
 			case actToggleOut:
-				if t.reverse {
+				if t.layout != layoutDefault {
 					return doAction(action{t: actToggleDown}, mapkey)
 				}
 				return doAction(action{t: actToggleUp}, mapkey)
@@ -1638,6 +1723,10 @@ func (t *Terminal) Loop() {
 				req(reqList)
 			case actAccept:
 				req(reqClose)
+			case actAcceptNonEmpty:
+				if len(t.selected) > 0 || t.merger.Length() > 0 || !t.reading && t.count == 0 {
+					req(reqClose)
+				}
 			case actClearScreen:
 				req(reqRedraw)
 			case actTop:
@@ -1738,13 +1827,21 @@ func (t *Terminal) Loop() {
 					mx -= t.window.Left()
 					my -= t.window.Top()
 					mx = util.Constrain(mx-t.promptLen, 0, len(t.input))
-					if !t.reverse {
-						my = t.window.Height() - my - 1
-					}
 					min := 2 + len(t.header)
 					if t.inlineInfo {
 						min--
 					}
+					h := t.window.Height()
+					switch t.layout {
+					case layoutDefault:
+						my = h - my - 1
+					case layoutReverseList:
+						if my < h-min {
+							my += min
+						} else {
+							my = h - my - 1
+						}
+					}
 					if me.Double {
 						// Double-click
 						if my >= min {
@@ -1762,6 +1859,10 @@ func (t *Terminal) Loop() {
 								toggle()
 							}
 							req(reqList)
+							if me.Left {
+								return doActions(t.keymap[tui.LeftClick], tui.LeftClick)
+							}
+							return doActions(t.keymap[tui.RightClick], tui.RightClick)
 						}
 					}
 				}
@@ -1803,6 +1904,12 @@ func (t *Terminal) Loop() {
 		t.mutex.Unlock() // Must be unlocked before touching reqBox

 		if changed {
+			if t.isPreviewEnabled() {
+				_, q := hasPreviewFlags(t.preview.command)
+				if q {
+					t.version++
+				}
+			}
 			t.eventBox.Set(EvtSearchNew, t.sort)
 		}
 		for _, event := range events {
@@ -1827,7 +1934,7 @@ func (t *Terminal) constrain() {
 }

 func (t *Terminal) vmove(o int, allowCycle bool) {
-	if t.reverse {
+	if t.layout != layoutDefault {
 		o *= -1
 	}
 	dest := t.cy + o
--- a/src/terminal_test.go
+++ b/src/terminal_test.go
@@ -21,6 +21,9 @@ func TestReplacePlaceholder(t *testing.T) {
 		newItem("foo'bar \x1b[31mbaz\x1b[m"),
 		newItem("FOO'BAR \x1b[31mBAZ\x1b[m")}

+	delim := "'"
+	var regex *regexp.Regexp
+
 	var result string
 	check := func(expected string) {
 		if result != expected {
@@ -72,6 +75,31 @@ func TestReplacePlaceholder(t *testing.T) {
 	result = replacePlaceholder("echo {1}/{2}/{-1}/{-2}/{..}/{n.t}/\\{}/\\{1}/\\{q}/{3}", true, Delimiter{}, true, "query", items2)
 	check("echo 'foo'\\''bar' 'FOO'\\''BAR'/'baz' 'BAZ'/'baz' 'BAZ'/'foo'\\''bar' 'FOO'\\''BAR'/'foo'\\''bar baz' 'FOO'\\''BAR BAZ'/{n.t}/{}/{1}/{q}/'' ''")

+	// Whitespace preserving flag with "'" delimiter
+	result = replacePlaceholder("echo {s1}", true, Delimiter{str: &delim}, false, "query", items1)
+	check("echo '  foo'")
+
+	result = replacePlaceholder("echo {s2}", true, Delimiter{str: &delim}, false, "query", items1)
+	check("echo 'bar baz'")
+
+	result = replacePlaceholder("echo {s}", true, Delimiter{str: &delim}, false, "query", items1)
+	check("echo '  foo'\\''bar baz'")
+
+	result = replacePlaceholder("echo {s..}", true, Delimiter{str: &delim}, false, "query", items1)
+	check("echo '  foo'\\''bar baz'")
+
+	// Whitespace preserving flag with regex delimiter
+	regex = regexp.MustCompile("\\w+")
+
+	result = replacePlaceholder("echo {s1}", true, Delimiter{regex: regex}, false, "query", items1)
+	check("echo '  '")
+
+	result = replacePlaceholder("echo {s2}", true, Delimiter{regex: regex}, false, "query", items1)
+	check("echo ''\\'''")
+
+	result = replacePlaceholder("echo {s3}", true, Delimiter{regex: regex}, false, "query", items1)
+	check("echo ' '")
+
 	// No match
 	result = replacePlaceholder("echo {}/{+}", true, Delimiter{}, false, "query", []*Item{nil, nil})
 	check("echo /")
@@ -81,12 +109,11 @@ func TestReplacePlaceholder(t *testing.T) {
 	check("echo /'  foo'\\''bar baz'")

 	// String delimiter
-	delim := "'"
 	result = replacePlaceholder("echo {}/{1}/{2}", true, Delimiter{str: &delim}, false, "query", items1)
 	check("echo '  foo'\\''bar baz'/'foo'/'bar baz'")

 	// Regex delimiter
-	regex := regexp.MustCompile("[oa]+")
+	regex = regexp.MustCompile("[oa]+")
 	// foo'bar baz
 	result = replacePlaceholder("echo {}/{1}/{3}/{2..3}", true, Delimiter{regex: regex}, false, "query", items1)
 	check("echo '  foo'\\''bar baz'/'f'/'r b'/''\\''bar b'")
--- a/src/tokenizer.go
+++ b/src/tokenizer.go
@@ -2,6 +2,7 @@ package fzf

 import (
 	"bytes"
+	"fmt"
 	"regexp"
 	"strconv"
 	"strings"
@@ -23,12 +24,22 @@ type Token struct {
 	prefixLength int32
 }

+// String returns the string representation of a Token.
+func (t Token) String() string {
+	return fmt.Sprintf("Token{text: %s, prefixLength: %d}", t.text, t.prefixLength)
+}
+
 // Delimiter for tokenizing the input
 type Delimiter struct {
 	regex *regexp.Regexp
 	str   *string
 }

+// String returns the string representation of a Delimeter.
+func (d Delimiter) String() string {
+	return fmt.Sprintf("Delimiter{regex: %v, str: &%q}", d.regex, *d.str)
+}
+
 func newRange(begin int, end int) Range {
 	if begin == 1 {
 		begin = rangeEllipsis
--- a/src/tokenizer_test.go
+++ b/src/tokenizer_test.go
@@ -9,35 +9,35 @@ func TestParseRange(t *testing.T) {
 		i := ".."
 		r, _ := ParseRange(&i)
 		if r.begin != rangeEllipsis || r.end != rangeEllipsis {
-			t.Errorf("%s", r)
+			t.Errorf("%v", r)
 		}
 	}
 	{
 		i := "3.."
 		r, _ := ParseRange(&i)
 		if r.begin != 3 || r.end != rangeEllipsis {
-			t.Errorf("%s", r)
+			t.Errorf("%v", r)
 		}
 	}
 	{
 		i := "3..5"
 		r, _ := ParseRange(&i)
 		if r.begin != 3 || r.end != 5 {
-			t.Errorf("%s", r)
+			t.Errorf("%v", r)
 		}
 	}
 	{
 		i := "-3..-5"
 		r, _ := ParseRange(&i)
 		if r.begin != -3 || r.end != -5 {
-			t.Errorf("%s", r)
+			t.Errorf("%v", r)
 		}
 	}
 	{
 		i := "3"
 		r, _ := ParseRange(&i)
 		if r.begin != 3 || r.end != 3 {
-			t.Errorf("%s", r)
+			t.Errorf("%v", r)
 		}
 	}
 }
--- a/src/tui/light.go
+++ b/src/tui/light.go
@@ -32,6 +32,12 @@ var offsetRegexp *regexp.Regexp = regexp.MustCompile("\x1b\\[([0-9]+);([0-9]+)R"
 func openTtyIn() *os.File {
 	in, err := os.OpenFile(consoleDevice, syscall.O_RDONLY, 0)
 	if err != nil {
+		tty := ttyname()
+		if len(tty) > 0 {
+			if in, err := os.OpenFile(tty, syscall.O_RDONLY, 0); err == nil {
+				return in
+			}
+		}
 		fmt.Fprintln(os.Stderr, "Failed to open "+consoleDevice)
 		os.Exit(2)
 	}
@@ -48,11 +54,13 @@ func (r *LightRenderer) stderrInternal(str string, allowNLCR bool) {
 	runes := []rune{}
 	for len(bytes) > 0 {
 		r, sz := utf8.DecodeRune(bytes)
-		if r == utf8.RuneError || r < 32 &&
-			r != '\x1b' && (!allowNLCR || r != '\n' && r != '\r') {
-			runes = append(runes, '?')
-		} else {
-			runes = append(runes, r)
+		nlcr := r == '\n' || r == '\r'
+		if r >= 32 || r == '\x1b' || nlcr {
+			if r == utf8.RuneError || nlcr && !allowNLCR {
+				runes = append(runes, ' ')
+			} else {
+				runes = append(runes, r)
+			}
 		}
 		bytes = bytes[sz:]
 	}
@@ -360,6 +368,11 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 	if r.buffer[1] >= 1 && r.buffer[1] <= 'z'-'a'+1 {
 		return Event{int(CtrlAltA + r.buffer[1] - 1), 0, nil}
 	}
+	alt := false
+	if len(r.buffer) > 2 && r.buffer[1] == ESC {
+		r.buffer = r.buffer[1:]
+		alt = true
+	}
 	switch r.buffer[1] {
 	case 32:
 		return Event{AltSpace, 0, nil}
@@ -380,12 +393,25 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 		*sz = 3
 		switch r.buffer[2] {
 		case 68:
+			if alt {
+				return Event{AltLeft, 0, nil}
+			}
 			return Event{Left, 0, nil}
 		case 67:
+			if alt {
+				// Ugh..
+				return Event{AltRight, 0, nil}
+			}
 			return Event{Right, 0, nil}
 		case 66:
+			if alt {
+				return Event{AltDown, 0, nil}
+			}
 			return Event{Down, 0, nil}
 		case 65:
+			if alt {
+				return Event{AltUp, 0, nil}
+			}
 			return Event{Up, 0, nil}
 		case 90:
 			return Event{BTab, 0, nil}
@@ -458,25 +484,22 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 						}
 					}
 					return Event{Invalid, 0, nil}
-				case 59:
+				case ';':
 					if len(r.buffer) != 6 {
 						return Event{Invalid, 0, nil}
 					}
 					*sz = 6
 					switch r.buffer[4] {
-					case 50:
+					case '2', '5':
 						switch r.buffer[5] {
-						case 68:
-							return Event{Home, 0, nil}
-						case 67:
-							return Event{End, 0, nil}
-						}
-					case 53:
-						switch r.buffer[5] {
-						case 68:
-							return Event{SLeft, 0, nil}
-						case 67:
+						case 'A':
+							return Event{SUp, 0, nil}
+						case 'B':
+							return Event{SDown, 0, nil}
+						case 'C':
 							return Event{SRight, 0, nil}
+						case 'D':
+							return Event{SLeft, 0, nil}
 						}
 					} // r.buffer[4]
 				} // r.buffer[3]
@@ -495,16 +518,19 @@ func (r *LightRenderer) mouseSequence(sz *int) Event {
 	}
 	*sz = 6
 	switch r.buffer[3] {
-	case 32, 36, 40, 48, // mouse-down / shift / cmd / ctrl
+	case 32, 34, 36, 40, 48, // mouse-down / shift / cmd / ctrl
 		35, 39, 43, 51: // mouse-up / shift / cmd / ctrl
 		mod := r.buffer[3] >= 36
+		left := r.buffer[3] == 32
 		down := r.buffer[3]%2 == 0
 		x := int(r.buffer[4] - 33)
 		y := int(r.buffer[5]-33) - r.yoffset
 		double := false
 		if down {
 			now := time.Now()
-			if now.Sub(r.prevDownTime) < doubleClickDuration {
+			if !left { // Right double click is not allowed
+				r.clickY = []int{}
+			} else if now.Sub(r.prevDownTime) < doubleClickDuration {
 				r.clickY = append(r.clickY, y)
 			} else {
 				r.clickY = []int{y}
@@ -517,14 +543,14 @@ func (r *LightRenderer) mouseSequence(sz *int) Event {
 			}
 		}

-		return Event{Mouse, 0, &MouseEvent{y, x, 0, down, double, mod}}
+		return Event{Mouse, 0, &MouseEvent{y, x, 0, left, down, double, mod}}
 	case 96, 100, 104, 112, // scroll-up / shift / cmd / ctrl
 		97, 101, 105, 113: // scroll-down / shift / cmd / ctrl
 		mod := r.buffer[3] >= 100
 		s := 1 - int(r.buffer[3]%2)*2
 		x := int(r.buffer[4] - 33)
 		y := int(r.buffer[5]-33) - r.yoffset
-		return Event{Mouse, 0, &MouseEvent{y, x, s, false, false, mod}}
+		return Event{Mouse, 0, &MouseEvent{y, x, s, false, false, false, mod}}
 	}
 	return Event{Invalid, 0, nil}
 }
@@ -789,7 +815,7 @@ func (w *LightWindow) Print(text string) {
 }

 func cleanse(str string) string {
-	return strings.Replace(str, "\x1b", "?", -1)
+	return strings.Replace(str, "\x1b", "", -1)
 }

 func (w *LightWindow) CPrint(pair ColorPair, attr Attr, text string) {
--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -193,19 +193,22 @@ func (r *FullscreenRenderer) GetChar() Event {
 		button := ev.Buttons()
 		mod := ev.Modifiers() != 0
 		if button&tcell.WheelDown != 0 {
-			return Event{Mouse, 0, &MouseEvent{y, x, -1, false, false, mod}}
+			return Event{Mouse, 0, &MouseEvent{y, x, -1, false, false, false, mod}}
 		} else if button&tcell.WheelUp != 0 {
-			return Event{Mouse, 0, &MouseEvent{y, x, +1, false, false, mod}}
+			return Event{Mouse, 0, &MouseEvent{y, x, +1, false, false, false, mod}}
 		} else if runtime.GOOS != "windows" {
 			// double and single taps on Windows don't quite work due to
 			// the console acting on the events and not allowing us
 			// to consume them.

-			down := button&tcell.Button1 != 0 // left
+			left := button&tcell.Button1 != 0
+			down := left || button&tcell.Button3 != 0
 			double := false
 			if down {
 				now := time.Now()
-				if now.Sub(r.prevDownTime) < doubleClickDuration {
+				if !left {
+					r.clickY = []int{}
+				} else if now.Sub(r.prevDownTime) < doubleClickDuration {
 					r.clickY = append(r.clickY, x)
 				} else {
 					r.clickY = []int{x}
@@ -218,7 +221,7 @@ func (r *FullscreenRenderer) GetChar() Event {
 				}
 			}

-			return Event{Mouse, 0, &MouseEvent{y, x, 0, down, double, mod}}
+			return Event{Mouse, 0, &MouseEvent{y, x, 0, left, down, double, mod}}
 		}

 		// process keyboard:
@@ -292,12 +295,24 @@ func (r *FullscreenRenderer) GetChar() Event {
 			return Event{BSpace, 0, nil}

 		case tcell.KeyUp:
+			if alt {
+				return Event{AltUp, 0, nil}
+			}
 			return Event{Up, 0, nil}
 		case tcell.KeyDown:
+			if alt {
+				return Event{AltDown, 0, nil}
+			}
 			return Event{Down, 0, nil}
 		case tcell.KeyLeft:
+			if alt {
+				return Event{AltLeft, 0, nil}
+			}
 			return Event{Left, 0, nil}
 		case tcell.KeyRight:
+			if alt {
+				return Event{AltRight, 0, nil}
+			}
 			return Event{Right, 0, nil}

 		case tcell.KeyHome:
--- a/src/tui/ttyname_unix.go
+++ b/src/tui/ttyname_unix.go
@@ -0,0 +1,31 @@
+// +build !windows
+
+package tui
+
+import (
+	"io/ioutil"
+	"syscall"
+)
+
+var devPrefixes = [...]string{"/dev/pts/", "/dev/"}
+
+func ttyname() string {
+	var stderr syscall.Stat_t
+	if syscall.Fstat(2, &stderr) != nil {
+		return ""
+	}
+
+	for _, prefix := range devPrefixes {
+		files, err := ioutil.ReadDir(prefix)
+		if err != nil {
+			continue
+		}
+
+		for _, file := range files {
+			if stat, ok := file.Sys().(*syscall.Stat_t); ok && stat.Rdev == stderr.Rdev {
+				return prefix + file.Name()
+			}
+		}
+	}
+	return ""
+}
--- a/src/tui/ttyname_windows.go
+++ b/src/tui/ttyname_windows.go
@@ -0,0 +1,7 @@
+// +build windows
+
+package tui
+
+func ttyname() string {
+	return ""
+}
--- a/src/tui/tui.go
+++ b/src/tui/tui.go
@@ -44,6 +44,8 @@ const (
 	Resize
 	Mouse
 	DoubleClick
+	LeftClick
+	RightClick

 	BTab
 	BSpace
@@ -59,6 +61,8 @@ const (
 	Home
 	End

+	SUp
+	SDown
 	SLeft
 	SRight

@@ -81,6 +85,11 @@ const (
 	AltSlash
 	AltBS

+	AltUp
+	AltDown
+	AltLeft
+	AltRight
+
 	Alt0
 )

@@ -185,6 +194,7 @@ type MouseEvent struct {
 	Y      int
 	X      int
 	S      int
+	Left   bool
 	Down   bool
 	Double bool
 	Mod    bool
--- a/src/util/chars.go
+++ b/src/util/chars.go
@@ -1,6 +1,7 @@
 package util

 import (
+	"fmt"
 	"unicode"
 	"unicode/utf8"
 	"unsafe"
@@ -94,6 +95,11 @@ func (chars *Chars) Length() int {
 	return len(chars.slice)
 }

+// String returns the string representation of a Chars object.
+func (chars *Chars) String() string {
+	return fmt.Sprintf("Chars{slice: []byte(%q), inBytes: %v, trimLengthKnown: %v, trimLength: %d, Index: %d}", chars.slice, chars.inBytes, chars.trimLengthKnown, chars.trimLength, chars.Index)
+}
+
 // TrimLength returns the length after trimming leading and trailing whitespaces
 func (chars *Chars) TrimLength() uint16 {
 	if chars.trimLengthKnown {
--- a/src/util/util.go
+++ b/src/util/util.go
@@ -17,11 +17,12 @@ func RuneWidth(r rune, prefixWidth int, tabstop int) int {
 		return tabstop - prefixWidth%tabstop
 	} else if w, found := _runeWidths[r]; found {
 		return w
-	} else {
-		w := Max(runewidth.RuneWidth(r), 1)
-		_runeWidths[r] = w
-		return w
+	} else if r == '\n' || r == '\r' {
+		return 1
 	}
+	w := runewidth.RuneWidth(r)
+	_runeWidths[r] = w
+	return w
 }

 // Max returns the largest integer
--- a/src/util/util_windows.go
+++ b/src/util/util_windows.go
@@ -20,7 +20,7 @@ func ExecCommandWith(_shell string, command string) *exec.Cmd {
 	cmd := exec.Command("cmd")
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		HideWindow:    false,
-		CmdLine:       fmt.Sprintf(` /s /c "%s"`, command),
+		CmdLine:       fmt.Sprintf(` /v:on/s/c "%s"`, command),
 		CreationFlags: 0,
 	}
 	return cmd
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -277,7 +277,7 @@ class TestGoFZF < TestBase

  def test_fzf_default_command_failure
    tmux.send_keys fzf.sub('FZF_DEFAULT_COMMAND=', 'FZF_DEFAULT_COMMAND=false'), :Enter
-    tmux.until { |lines| lines[-2].include?('ERROR') }
+    tmux.until { |lines| lines[-2].include?('FZF_DEFAULT_COMMAND failed') }
    tmux.send_keys :Enter
  end

@@ -769,6 +769,15 @@ class TestGoFZF < TestBase
    assert_equal %w[print-my-query], readonce.split($INPUT_RECORD_SEPARATOR)
  end

+  def test_bind_replace_query
+    tmux.send_keys "seq 1 1000 | #{fzf '--print-query --bind=ctrl-j:replace-query'}", :Enter
+    tmux.send_keys '1'
+    tmux.until { |lines| lines[-2].end_with? '272/1000' }
+    tmux.send_keys 'C-k', 'C-j'
+    tmux.until { |lines| lines[-2].end_with? '29/1000' }
+    tmux.until { |lines| lines[-1].end_with? '> 10' }
+  end
+
  def test_long_line
    data = '.' * 256 * 1024
    File.open(tempname, 'w') do |f|
@@ -1051,6 +1060,21 @@ class TestGoFZF < TestBase
    assert_equal '50', readonce.chomp
  end

+  def test_header_lines_reverse_list
+    tmux.send_keys "seq 100 | #{fzf '--header-lines=10 -q 5 --layout=reverse-list'}", :Enter
+    2.times do
+      tmux.until do |lines|
+        lines[0]    == '> 50' &&
+          lines[-4] == '  2' &&
+          lines[-3] == '  1' &&
+          lines[-2].include?('/90')
+      end
+      tmux.send_keys :Up
+    end
+    tmux.send_keys :Enter
+    assert_equal '50', readonce.chomp
+  end
+
  def test_header_lines_overflow
    tmux.send_keys "seq 100 | #{fzf '--header-lines=200'}", :Enter
    tmux.until do |lines|
@@ -1078,7 +1102,8 @@ class TestGoFZF < TestBase
    header = File.readlines(FILE).take(5).map(&:strip)
    tmux.until do |lines|
      lines[-2].include?('100/100') &&
-        lines[-7..-3].map(&:strip) == header
+        lines[-7..-3].map(&:strip) == header &&
+        lines[-8] == '> 1'
    end
  end

@@ -1087,7 +1112,18 @@ class TestGoFZF < TestBase
    header = File.readlines(FILE).take(5).map(&:strip)
    tmux.until do |lines|
      lines[1].include?('100/100') &&
-        lines[2..6].map(&:strip) == header
+        lines[2..6].map(&:strip) == header &&
+        lines[7] == '> 1'
+    end
+  end
+
+  def test_header_reverse_list
+    tmux.send_keys "seq 100 | #{fzf "--header=\\\"\\$(head -5 #{FILE})\\\" --layout=reverse-list"}", :Enter
+    header = File.readlines(FILE).take(5).map(&:strip)
+    tmux.until do |lines|
+      lines[-2].include?('100/100') &&
+        lines[-7..-3].map(&:strip) == header &&
+        lines[0] == '> 1'
    end
  end

@@ -1111,6 +1147,16 @@ class TestGoFZF < TestBase
    end
  end

+  def test_header_and_header_lines_reverse_list
+    tmux.send_keys "seq 100 | #{fzf "--layout=reverse-list --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 &&
+        lines[-17...-7].map(&:strip) == (1..10).map(&:to_s).reverse
+    end
+  end
+
  def test_cancel
    tmux.send_keys "seq 10 | #{fzf '--bind 2:cancel'}", :Enter
    tmux.until { |lines| lines[-2].include?('10/10') }
@@ -1136,6 +1182,12 @@ class TestGoFZF < TestBase
    tmux.send_keys :Enter
  end

+  def test_margin_reverse_list
+    tmux.send_keys "yes | head -1000 | #{fzf '--margin 5,3 --layout=reverse-list'}", :Enter
+    tmux.until { |lines| lines[4] == '' && lines[5] == '   > y' }
+    tmux.send_keys :Enter
+  end
+
  def test_tabstop
    writelines tempname, ["f\too\tba\tr\tbaz\tbarfooq\tux"]
    {
@@ -1319,12 +1371,12 @@ class TestGoFZF < TestBase
  end

  def test_preview_hidden
-    tmux.send_keys %(seq 1000 | #{FZF} --preview 'echo {{}-{}}' --preview-window down:1:hidden --bind ?:toggle-preview), :Enter
+    tmux.send_keys %(seq 1000 | #{FZF} --preview 'echo {{}-{}-\\$LINES-\\$COLUMNS}' --preview-window down:1:hidden --bind ?:toggle-preview), :Enter
    tmux.until { |lines| lines[-1] == '>' }
    tmux.send_keys '?'
-    tmux.until { |lines| lines[-2].include?(' {1-1}') }
+    tmux.until { |lines| lines[-2] =~ / {1-1-1-[0-9]+}/ }
    tmux.send_keys '555'
-    tmux.until { |lines| lines[-2].include?(' {555-555}') }
+    tmux.until { |lines| lines[-2] =~ / {555-555-1-[0-9]+}/ }
    tmux.send_keys '?'
    tmux.until { |lines| lines[-1] == '> 555' }
  end
@@ -1346,6 +1398,35 @@ class TestGoFZF < TestBase
    tmux.until { |_| %w[1 2 3] == File.readlines(tempname).map(&:chomp) }
  end

+  def test_preview_flags
+    tmux.send_keys %(seq 10 | sed 's/^/:: /; s/$/  /' |
+        #{FZF} --multi --preview 'echo {{2}/{s2}/{+2}/{+s2}/{q}}'), :Enter
+    tmux.until { |lines| lines[1].include?('{1/1  /1/1  /}') }
+    tmux.send_keys '123'
+    tmux.until { |lines| lines[1].include?('{////123}') }
+    tmux.send_keys 'C-u', '1'
+    tmux.until { |lines| lines.match_count == 2 }
+    tmux.until { |lines| lines[1].include?('{1/1  /1/1  /1}') }
+    tmux.send_keys :BTab
+    tmux.until { |lines| lines[1].include?('{10/10  /1/1  /1}') }
+    tmux.send_keys :BTab
+    tmux.until { |lines| lines[1].include?('{10/10  /1 10/1   10  /1}') }
+    tmux.send_keys '2'
+    tmux.until { |lines| lines[1].include?('{//1 10/1   10  /12}') }
+    tmux.send_keys '3'
+    tmux.until { |lines| lines[1].include?('{//1 10/1   10  /123}') }
+  end
+
+  def test_preview_q_no_match
+    tmux.send_keys %(: | #{FZF} --preview 'echo foo {q}'), :Enter
+    tmux.until { |lines| lines.match_count == 0 }
+    tmux.until { |lines| !lines[1].include?('foo') }
+    tmux.send_keys 'bar'
+    tmux.until { |lines| lines[1].include?('foo bar') }
+    tmux.send_keys 'C-u'
+    tmux.until { |lines| !lines[1].include?('foo') }
+  end
+
  def test_no_clear
    tmux.send_keys "seq 10 | fzf --no-clear --inline-info --height 5 > #{tempname}", :Enter
    prompt = '>   < 10/10'
@@ -1369,6 +1450,42 @@ class TestGoFZF < TestBase
    tmux.send_keys :Enter
  end

+  def test_accept_non_empty
+    tmux.send_keys %(seq 1000 | #{fzf '--print-query --bind enter:accept-non-empty'}), :Enter
+    tmux.until { |lines| lines.match_count == 1000 }
+    tmux.send_keys 'foo'
+    tmux.until { |lines| lines[-2].include? '0/1000' }
+    # fzf doesn't exit since there's no selection
+    tmux.send_keys :Enter
+    tmux.until { |lines| lines[-2].include? '0/1000' }
+    tmux.send_keys 'C-u'
+    tmux.until { |lines| lines[-2].include? '1000/1000' }
+    tmux.send_keys '999'
+    tmux.until { |lines| lines[-2].include? '1/1000' }
+    tmux.send_keys :Enter
+    assert_equal %w[999 999], readonce.split($INPUT_RECORD_SEPARATOR)
+  end
+
+  def test_accept_non_empty_with_multi_selection
+    tmux.send_keys %(seq 1000 | #{fzf '-m --print-query --bind enter:accept-non-empty'}), :Enter
+    tmux.until { |lines| lines.match_count == 1000 }
+    tmux.send_keys :Tab
+    tmux.until { |lines| lines[-2].include? '1000/1000 (1)' }
+    tmux.send_keys 'foo'
+    tmux.until { |lines| lines[-2].include? '0/1000' }
+    # fzf will exit in this case even though there's no match for the current query
+    tmux.send_keys :Enter
+    assert_equal %w[foo 1], readonce.split($INPUT_RECORD_SEPARATOR)
+  end
+
+  def test_accept_non_empty_with_empty_list
+    tmux.send_keys %(: | #{fzf '-q foo --print-query --bind enter:accept-non-empty'}), :Enter
+    tmux.until { |lines| lines[-2].strip == '0/0' }
+    tmux.send_keys :Enter
+    # fzf will exit anyway since input list is empty
+    assert_equal %w[foo], readonce.split($INPUT_RECORD_SEPARATOR)
+  end
+
  def test_preview_update_on_select
    tmux.send_keys(%(seq 10 | fzf -m --preview 'echo {+}' --bind a:toggle-all),
                   :Enter)
@@ -1469,7 +1586,7 @@ module TestShell
    lines = retries do
      tmux.prepare
      tmux.send_keys :Escape, :c
-      tmux.until { |lines| lines.item_count.positive? }
+      tmux.until { |lines| lines.match_count.positive? }
    end
    expected = lines.reverse.select { |l| l.start_with? '>' }.first[2..-1]
    tmux.send_keys :Enter
@@ -1506,7 +1623,7 @@ module TestShell
    retries do
      tmux.prepare
      tmux.send_keys 'C-r'
-      tmux.until { |lines| lines.item_count.positive? }
+      tmux.until { |lines| lines.match_count.positive? }
    end
    tmux.send_keys 'C-r'
    tmux.send_keys '3d'
@@ -1538,7 +1655,7 @@ module CompletionTest
    end
    tmux.prepare
    tmux.send_keys 'cat /tmp/fzf-test/10**', :Tab
-    tmux.until { |lines| lines.item_count.positive? }
+    tmux.until { |lines| lines.match_count.positive? }
    tmux.send_keys ' !d'
    tmux.until { |lines| lines.match_count == 2 }
    tmux.send_keys :Tab, :Tab
@@ -1552,7 +1669,7 @@ module CompletionTest
    # ~USERNAME**<TAB>
    tmux.send_keys 'C-u'
    tmux.send_keys "cat ~#{ENV['USER']}**", :Tab
-    tmux.until { |lines| lines.item_count.positive? }
+    tmux.until { |lines| lines.match_count.positive? }
    tmux.send_keys "'.fzf-home"
    tmux.until { |lines| lines.select { |l| l.include? '.fzf-home' }.count > 1 }
    tmux.send_keys :Enter
@@ -1570,7 +1687,7 @@ module CompletionTest
    # /tmp/fzf\ test**<TAB>
    tmux.send_keys 'C-u'
    tmux.send_keys 'cat /tmp/fzf\ test/**', :Tab
-    tmux.until { |lines| lines.item_count.positive? }
+    tmux.until { |lines| lines.match_count.positive? }
    tmux.send_keys 'foobar$'
    tmux.until { |lines| lines.match_count == 1 }
    tmux.send_keys :Enter
@@ -1590,7 +1707,7 @@ module CompletionTest

  def test_file_completion_root
    tmux.send_keys 'ls /**', :Tab
-    tmux.until { |lines| lines.item_count.positive? }
+    tmux.until { |lines| lines.match_count.positive? }
    tmux.send_keys :Enter
  end

@@ -1601,7 +1718,7 @@ module CompletionTest
    FileUtils.touch '/tmp/fzf-test/d55/xxx'
    tmux.prepare
    tmux.send_keys 'cd /tmp/fzf-test/**', :Tab
-    tmux.until { |lines| lines.item_count.positive? }
+    tmux.until { |lines| lines.match_count.positive? }
    tmux.send_keys :Tab, :Tab # Tab does not work here
    tmux.send_keys 55
    tmux.until { |lines| lines.match_count == 1 }
@@ -1630,7 +1747,7 @@ module CompletionTest
    tmux.prepare
    tmux.send_keys 'C-L'
    tmux.send_keys 'kill ', :Tab
-    tmux.until { |lines| lines.item_count.positive? }
+    tmux.until { |lines| lines.match_count.positive? }
    tmux.send_keys 'sleep12345'
    tmux.until { |lines| lines.any_include? 'sleep 12345' }
    tmux.send_keys :Enter
@@ -1649,7 +1766,7 @@ module CompletionTest
    tmux.send_keys '_fzf_compgen_path() { echo "\$1"; seq 10; }', :Enter
    tmux.prepare
    tmux.send_keys 'ls /tmp/**', :Tab
-    tmux.until { |lines| lines.item_count == 11 }
+    tmux.until { |lines| lines.match_count == 11 }
    tmux.send_keys :Tab, :Tab, :Tab
    tmux.until { |lines| lines.select_count == 3 }
    tmux.send_keys :Enter
@@ -1716,6 +1833,23 @@ class TestBash < TestBase
    super
    @tmux = Tmux.new :bash
  end
+
+  def test_dynamic_completion_loader
+    tmux.paste 'touch /tmp/foo; _fzf_completion_loader=1'
+    tmux.paste '_completion_loader() { complete -o default fake; }'
+    tmux.paste 'complete -F _fzf_path_completion -o default -o bashdefault fake'
+    tmux.send_keys 'fake /tmp/foo**', :Tab
+    tmux.until { |lines| lines.match_count.positive? }
+    tmux.send_keys 'C-c'
+
+    tmux.prepare
+    tmux.send_keys 'fake /tmp/foo'
+    tmux.send_keys :Tab , 'C-u'
+
+    tmux.prepare
+    tmux.send_keys 'fake /tmp/foo**', :Tab
+    tmux.until { |lines| lines.match_count.positive? }
+  end
 end

 class TestZsh < TestBase
--- a/72
+++ b/72
@@ -1,12 +1,45 @@
 #!/usr/bin/env bash

-confirm() {
-  while [ 1 ]; do
-    read -p "$1" -n 1 -r
-    echo
-    if [[ "$REPLY" =~ ^[Yy] ]]; then
+xdg=0
+prefix='~/.fzf'
+prefix_expand=~/.fzf
+fish_dir=${XDG_CONFIG_HOME:-$HOME/.config}/fish
+
+help() {
+  cat << EOF
+usage: $0 [OPTIONS]
+
+    --help               Show this message
+    --xdg                Remove files generated under \$XDG_CONFIG_HOME/fzf
+EOF
+}
+
+for opt in "$@"; do
+  case $opt in
+    --help)
+      help
+      exit 0
+      ;;
+    --xdg)
+      xdg=1
+      prefix='"${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf'
+      prefix_expand=${XDG_CONFIG_HOME:-$HOME/.config}/fzf/fzf
+      ;;
+    *)
+      echo "unknown option: $opt"
+      help
+      exit 1
+      ;;
+  esac
+done
+
+ask() {
+  while true; do
+    read -p "$1 ([y]/n) " -r
+    REPLY=${REPLY:-"y"}
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
      return 0
-    elif [[ "$REPLY" =~ ^[Nn] ]]; then
+    elif [[ $REPLY =~ ^[Nn]$ ]]; then
      return 1
    fi
  done
@@ -40,7 +73,7 @@ remove_line() {
    content=$(sed 's/^[0-9]*://' <<< "$line")
    match=1
    echo    "  - Line #$line_no: $content"
-    [ "$content" = "$1" ] || confirm "    - Remove (y/n) ? "
+    [ "$content" = "$1" ] || ask "    - Remove?"
    if [ $? -eq 0 ]; then
      awk -v n=$line_no 'NR == n {next} {print}' "$src" > "$src.bak" &&
        mv "$src.bak" "$src" || break
@@ -55,25 +88,30 @@ remove_line() {
 }

 for shell in bash zsh; do
-  remove ~/.fzf.${shell}
+  shell_config=${prefix_expand}.${shell}
+  remove "${shell_config}"
  remove_line ~/.${shell}rc \
-    "[ -f ~/.fzf.${shell} ] && source ~/.fzf.${shell}" \
-    "source ~/.fzf.${shell}"
+    "[ -f ${prefix}.${shell} ] && source ${prefix}.${shell}" \
+    "source ${prefix}.${shell}"
 done

-bind_file=~/.config/fish/functions/fish_user_key_bindings.fish
+bind_file="${fish_dir}/functions/fish_user_key_bindings.fish"
 if [ -f "$bind_file" ]; then
  remove_line "$bind_file" "fzf_key_bindings"
 fi

-if [ -d ~/.config/fish/functions ]; then
-  remove ~/.config/fish/functions/fzf.fish
-  remove ~/.config/fish/functions/fzf_key_bindings.fish
+if [ -d "${fish_dir}/functions" ]; then
+  remove "${fish_dir}/functions/fzf.fish"
+  remove "${fish_dir}/functions/fzf_key_bindings.fish"

-  if [ "$(ls -A ~/.config/fish/functions)" ]; then
-    echo "Can't delete non-empty directory: \"~/.config/fish/functions\""
+  if [ "$(ls -A "${fish_dir}/functions")" ]; then
+    echo "Can't delete non-empty directory: \"${fish_dir}/functions\""
  else
-    rmdir ~/.config/fish/functions
+    rmdir "${fish_dir}/functions"
  fi
 fi

+config_dir=$(dirname "$prefix_expand")
+if [[ "$xdg" = 1 ]] && [[ "$config_dir" = */fzf ]] && [[ -d "$config_dir" ]]; then
+  rmdir "$config_dir"
+fi
Author	SHA1	Message	Date
Junegunn Choi	f0fe79dd3b	0.17.4	2018-06-10 10:35:52 +09:00
Akinori MUSHA	daa1958f86	Provide an option to reverse items only (#1267 )	2018-06-10 01:41:50 +09:00
Junegunn Choi	2c26f02f5c	Improve preview window update events - Update preview window even if there is no match for the query string if any of the placeholder expressions evaluates to a non-empty string. - Also, if the command template contains {q}, preview window will be updated if the query string changes even though the focus remains on the same item. An example: git log --oneline --color=always \| fzf --reverse --ansi --preview \ '[ -n {1} ] && git show --color=always {1} \|\| git show --color=always {q}' Close #1307	2018-06-10 01:40:22 +09:00
Junegunn Choi	af87650bc4	[docker] Build binary from source	2018-06-08 19:42:29 +09:00
ptzz	2b19c0bc68	[bash/zsh] Fix missing fuzzy completions (#1303 ) * [bash/zsh] Fix missing fuzzy completions `cat foo*<TAB>` did not display the file `foobar` if there was a directory named `foo`. Fixes #1301 [zsh] Evaluate completion prefix cat $HOME cat ~username cat ~username/foo**	2018-06-02 10:40:33 +09:00
Junegunn Choi	76a2dcb5a9	Add Dockerfile for running tests make docker make docker-test	2018-06-01 18:23:25 +09:00
Junegunn Choi	68ec3d1c10	Fix flaky test cases	2018-06-01 18:21:34 +09:00
Mark	2ff19084ca	[install] Support for XDG Base Directory Specification (#1282 ) Add --xdg option which makes the installer generate files under $XDG_CONFIG_HOME/fzf.	2018-06-01 11:54:58 +09:00
Daniel Gray	62f062ecfa	Remove -y flag from Arch Linux installation (#1290 ) https://wiki.archlinux.org/index.php/Partial_upgrades#Partial_upgrades_are_unsupported You should never `pacman -Sy <pkg>`, Arch users are expected to keep their system already up-to-date before installing anything.	2018-05-14 17:24:32 +09:00
Jan Edmund Lazo	cce17ad0a0	[vim] Use CRLF in batchfile for multibyte codepage (#1289 ) Close #1288	2018-05-13 16:24:28 +09:00
Junegunn Choi	b8296a91b9	Clarify Vim plugin instruction Close #1251 @amaravora	2018-05-04 16:01:42 +09:00
Junegunn Choi	6e9452b06e	Add Arch Linux installation instruction Close #1273 @codingCoffee	2018-05-04 16:00:40 +09:00
Junegunn Choi	888fd35689	[fzf-tmux] Avoid unnecessary recovery of window options fzf-tmux temporarily turns off remain-on-exit and synchronize-panes options. We don't have to try to restore the values of the options if they were already turned off when fzf-tmux was started.	2018-05-04 15:38:27 +09:00
ptzz	1fb0fbca58	[bash] Do not print error when falling back to default completion (#1279 ) Fixes #1278	2018-05-04 14:55:48 +09:00
Heinrich Kruger	ddd2a109e4	[fzf-tmux] Restore tmux window options (#1272 ) Restore the original values of 'remain-on-exit' and 'synchronize-panes' options when exiting 'fzf-tmux'.	2018-05-04 04:25:15 +09:00
Junegunn Choi	87504a528e	[bash] Fix infinite loop on tab completion awk may not set OFS to match FS depending on the implementation. Close #1227	2018-04-30 12:58:10 +09:00
Junegunn Choi	6eac4af7db	[vim] Ignore Vim:Interrupt when "Abort" selected on E325 Close #1268	2018-04-26 10:23:18 +09:00
Junegunn Choi	89de1340af	[bash] Add --sync to the default CTRL-R options This compensates the use of --tac. fzf will not render on the screen until the complete list of commands are loaded.	2018-04-25 18:47:56 +09:00
Junegunn Choi	9e753a0d44	Implement ttyname() in case /dev/tty is not available Close #1266 Close #447	2018-04-25 17:50:47 +09:00
Junegunn Choi	f57920ad90	Do not print non-displayable characters fzf used to print non-displayable characters (ascii code < 32) as '?', but we will simply ignore those characters with this patch, just like our terminals do. \n and \r are exceptions. They will be printed as a space character. TODO: \H should delete the preceding character, but this is not implemented. Related: #1253	2018-04-12 17:49:52 +09:00
Junegunn Choi	7dbbbef51a	Add support for alt-{up,down,left,right} keys Close #1234	2018-04-12 17:42:48 +09:00
Avindra Goolcharan	7add75126d	ZSH and Bash completion: remove shebang (#1248 ) Shebangs are only for files that are directly executable. In cases where files are only sourced (such as completion scripts), these are unneeded.	2018-04-12 17:21:56 +09:00
Akinori MUSHA	d207672bd5	Parse the output of `go version` to get the value of GOOS (#1260 )	2018-04-12 17:09:08 +09:00
Robert Orzanna	851fa38251	Add reference to Fedora package documentation (#1255 )	2018-04-06 14:10:10 +09:00
ZDNoFYVe	43345fb642	Implement flag for preserving whitespace around field (#1242 )	2018-03-30 11:47:46 +09:00
xalexalex	9ff33814ea	Fix typo in README (#1243 )	2018-03-27 17:53:20 +09:00
Ryan Boehning	21b94d2de5	Make fzf pass go vet Add String() methods to types, so they can be printed with %s. Change some %s format specifiers to %v, when the default string representation is good enough. In Go 1.10, `go test` triggers a parallel `go vet`. So this also makes fzf pass `go test`. Close #1236 Close #1219	2018-03-13 14:56:55 +09:00
Jesse Leite	24236860c8	Document inverse prefix exact match search syntax (#1224 ) * Document inverse prefix exact match search syntax. * Reorder search syntax table to explain basic exact match first.	2018-03-06 16:33:33 +09:00
Junegunn Choi	3f868fd792	[bash] Fix CTRL-R to preserve the latest yank Close #1216 1. Append a single space so that step 3 won't fail 2. CTRL-E to move to the end of the line 3. CTRL-U to delete the whole line before the cursor 4. CTRL-Y to paste the deleted line 5. ESC+Y to rotate the kill ring and bring back the previous yank before step 3 6. CTRL-U to delete the whole line again 7. Paste `__fzf_history__` 8. ESC+CTRL-E to expand the command substitution 9. ESC+R to redraw the line 10. ESC+^ to expand the history entry (!NUMBER)	2018-02-16 21:55:23 +09:00
Junegunn Choi	417bca03df	Add shift-up and shift-down For now, they are respectively bound to preview-up and preview-down by default (TBD). Not available on tcell build. Close #1201	2018-02-15 19:57:21 +09:00
Junegunn Choi	cce6aef557	[bash] Fix extra space issue of dynamic completion with 'nospace' Close #1203	2018-02-15 18:21:02 +09:00
Junegunn Choi	eb3afc03b5	[vim] Make list options compatible with layout options Fix #1205	2018-01-26 13:48:05 +09:00
Jan Edmund Lazo	7f0caf0683	Update Windows default command to print relative paths (#1200 )	2018-01-17 22:02:50 +09:00
Pierre P	7f606665cb	[install] Make default answer "y" (#1195 )	2018-01-14 03:19:33 +09:00
Junegunn Choi	202872c2dc	Remove PayPal donation button I've decided not to take more donations. Thanks to everyone who has supported my projects. Edgar Hipp Eyal Levin Philip Stewart James O'Beirne Minh Triet Ly Victor Alvarez Max Hung Gearoid Murphy Aaron Taylor Brett Bender Phil Thompson Anders Damsgaard	2018-01-06 02:47:42 +09:00
Junegunn Choi	93aeae1985	[bash] Trigger redraw-current-line before history-expand-line Close #681	2017-12-07 23:33:01 +09:00
Junegunn Choi	5c34ab6692	[vim] Fix terminal buffer cleanup on Vim 8 Close #1172	2017-12-05 23:50:55 +09:00
Junegunn Choi	390b49653b	0.17.3	2017-12-03 23:55:24 +09:00
Junegunn Choi	b877c385f0	Fix assertions in test_dynamic_completion_loader	2017-12-03 23:54:58 +09:00
Junegunn Choi	9c47739c0e	Fix panic when replace-query is triggered on empty result set	2017-12-03 23:48:59 +09:00
Junegunn Choi	04aa2992e7	Revert "0.17.2" This reverts commit `2f1edeff78`.	2017-12-03 23:42:38 +09:00
Junegunn Choi	2f1edeff78	0.17.2	2017-12-03 23:34:37 +09:00
Junegunn Choi	306d51cdcf	Update tcell to fix double-enter problem on Windows GVim - Close #1169 - https://github.com/gdamore/tcell/pull/159	2017-12-03 23:32:45 +09:00
Junegunn Choi	54a026525a	[vim] Remove unnecessary term_wait workaround The issue is fixed in `1232624ae5`	2017-12-03 23:32:43 +09:00
Junegunn Choi	d6588fc835	[bash-completion] Fix custom completion with dynamic loader enabled After _completion_loader is called, instead of loading the entire completion.bash file, just restore the fzf completion for the current command. `_fzf_orig_completion_$cmd` is only set if _completion_loader actually changed the completion options to avoid infinite loop. Close #1170	2017-12-03 23:32:41 +09:00
Junegunn Choi	5a7b41a2cf	Add accept-non-empty action 'accept-non-empty' is similar to 'accept' (which is bound to 'enter' and 'double-click' by default) but it prevents fzf from exiting without any selection. Close #1162	2017-12-02 02:28:36 +09:00
Junegunn Choi	338a73d764	[man] Describe 'cancel' action	2017-12-01 19:13:51 +09:00
Junegunn Choi	c20954f020	Add replace-query action replace-query action replaces the query string with the current selection. If the selection is too long, it will be truncated. If the line contains meta-characters of fzf search syntax, it is possible that the line is no longer included in the updated result. e.g. echo '!hello' \| fzf --bind ctrl-v:replace-query Close #1137	2017-12-01 13:08:55 +09:00
Junegunn Choi	1e8e1d3c9d	Fix test case on older versions of Ruby	2017-12-01 13:03:02 +09:00
Junegunn Choi	f6b1962056	Inject $LINES and $COLUMNS when running preview command Close #1168	2017-12-01 03:28:10 +09:00
Junegunn Choi	b3b101a89c	Support binding of left-click and right-click left-click and right-click are respectively bound to "ignore" and "toggle" (after implicitly moving the cursor) by default. Close #1130	2017-12-01 03:28:08 +09:00
Junegunn Choi	9615c4edf1	Fix test case for invalid FZF_DEFAULT_COMMAND	2017-12-01 02:22:36 +09:00
Junegunn Choi	85a75ee035	Revert default command: find with -fstype required In #1061 we changed the default command to retry with a simpler find command with fewer arguments if the first find command failed. This was to support stripped-down verions of find that do not support -fstype argument. However, this caused an unwanted side-effect of yielding duplicate entries when the first command failed after producing some lines. We revert the change in this commit, so the default command will not work with find without -fstype support. But we now print better error message in that case so that the user can set up a working $FZF_DEFAULT_COMMAND. Close #1120 #1167	2017-12-01 01:40:42 +09:00
Junegunn Choi	1e5bd55672	[install] Change the order of case patterns for $archi (#1060 ) /cc @ehandal	2017-11-27 15:44:19 +09:00
Jan Edmund Lazo	37d4015d56	[vim] Don't use :terminal on msys2 or Cygwin (#1155 ) Close #1152 msys2 terminal Vim assumes that it runs in mintty so `:terminal` uses `TERM=xterm`. fzf doesn't support `TERM=xterm` on Windows.	2017-11-22 13:34:02 +09:00
Junegunn Choi	6b27554cdb	Clarify installation instructions	2017-11-22 03:10:20 +09:00
Junegunn Choi	fc1b119159	[vim] Add instruction to hide statusline of terminal buffer (#1143 )	2017-11-19 12:07:54 +09:00
Aaron Jensen	2cd0d4a9f7	[zsh] Fire zsh precmd functions after cd (#1136 ) Fixes #915	2017-11-14 12:43:52 +09:00
Elliott Sales de Andrade	fd03aabeb2	Add Fedora installation information (#1141 )	2017-11-14 12:40:17 +09:00
Justin Toniazzo	8068c975c2	Fix broken link in readme TOC (#1131 ) The `Respecting .gitignore` link pointed to a section of the readme which no longer exists.	2017-11-08 23:54:46 +09:00
Junegunn Choi	a6d2ab3360	Update README: Examples using fd - https://github.com/sharkdp/fd - https://mike.place/2017/fzf-fd/ /cc @williamsmj	2017-10-29 23:48:55 +09:00
Adam Dinwoodie	fe7b91dfd9	Add bin/fzf.exe to .gitignore (#1111 ) On Cygwin and MinGW, the fzf binary will have a .exe extension, so ignore that binary if it exists as well as the bare binary.	2017-10-27 09:12:12 +09:00
Junegunn Choi	5784101bea	Suggest ripgrep instead of the silver searcher Since https://github.com/BurntSushi/ripgrep/issues/200 is fixed in 0.7.1, we can safely suggest ripgrep as the candidate generator as it has a more precise implementation of gitignore filtering than the silver searcher.	2017-10-23 13:19:11 +09:00
Igor Urazov	eaf6eb8978	[completion] Ensure ps called as command (#1098 ) When `ps` is aliased for something uncommon, like `alias ps=grc ps` which colorizes ps output, the output of `ps` can be unexpected and/or undesired. This change makes ps to be always executed as command, even if it's aliased.	2017-10-21 10:31:34 +09:00
Daniel Schaffrath	3af63bcf1f	[zsh] Use fc -r instead of fzf --tac to speed up loadtime (#1097 ) Reference: http://zsh.sourceforge.net/Doc/Release/Shell-Builtin-Commands.html > The flag -r reverses the order of the events	2017-10-20 12:56:02 +09:00
Andrey Chernih	80a21f7a75	[completion] Fix known_hosts completion for custom port number (#1092 ) Handles records like "[20.20.7.168]:9722 ssh-rsa ..." This is a standard format for servers running on custom port according to http://man.openbsd.org/sshd.8#SSH_KNOWN_HOSTS_FILE_FORMAT A hostname or address may optionally be enclosed within ‘[’ and ‘]’ brackets then followed by ‘:’ and a non-standard port number.	2017-10-19 22:04:32 +09:00