From 34946b72a5e5a3d3c5c31fef4b373dcbc7b3821f Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Thu, 21 May 2015 00:38:40 +0900
Subject: [PATCH] 0.9.12

---
 CHANGELOG.md          | 11 +++++++++++
 fzf                   |  4 ++--
 install               |  2 +-
 man/man1/fzf.1        |  2 +-
 shell/completion.bash |  5 +++--
 src/constants.go      |  2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be5d22d..3afe698 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 CHANGELOG
 =========
 
+0.9.12
+------
+
+### New features
+
+- Added `--bind` option for custom key bindings
+
+### Bug fixes
+
+- Fixed to update "inline-info" immediately after terminal resize
+
 0.9.11
 ------
 
diff --git a/fzf b/fzf
index 9e85e04..a29ae33 100755
--- a/fzf
+++ b/fzf
@@ -206,10 +206,10 @@ class FZF
         @expect = true
       when /^--expect=(.*)$/
         @expect = true
-      when '--toggle-sort', '--tiebreak', '--color'
+      when '--toggle-sort', '--tiebreak', '--color', '--bind'
         argv.shift
       when '--tac', '--no-tac', '--sync', '--no-sync', '--hscroll', '--no-hscroll',
-           '--inline-info', '--no-inline-info',
+           '--inline-info', '--no-inline-info', /^--bind=(.*)$/,
            /^--color=(.*)$/, /^--toggle-sort=(.*)$/, /^--tiebreak=(.*)$/
         # XXX
       else
diff --git a/install b/install
index ab4cb21..96e82b4 100755
--- a/install
+++ b/install
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-version=0.9.11
+version=0.9.12
 
 cd $(dirname $BASH_SOURCE)
 fzf_base=$(pwd)
diff --git a/man/man1/fzf.1 b/man/man1/fzf.1
index 47f2cdf..a696cb7 100644
--- 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 "April 2015" "fzf 0.9.11" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "May 2015" "fzf 0.9.12" "fzf - a command-line fuzzy finder"
 
 .SH NAME
 fzf - a command-line fuzzy finder
diff --git a/shell/completion.bash b/shell/completion.bash
index ac8198e..59bdfe4 100644
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -29,6 +29,7 @@ _fzf_opts_completion() {
     +s --no-sort
     --tac
     --tiebreak
+    --bind
     -m --multi
     --no-mouse
     --color
@@ -222,11 +223,11 @@ a_cmds="
 x_cmds="kill ssh telnet unset unalias export"
 
 # Preserve existing completion
-if [ "$_fzf_completion_loaded" != '0.8.6-1' ]; then
+if [ "$_fzf_completion_loaded" != '0.9.12' ]; then
   # Really wish I could use associative array but OSX comes with bash 3.2 :(
   eval $(complete | \grep '\-F' | \grep -v _fzf_ |
     \grep -E " ($(echo $d_cmds $f_cmds $a_cmds $x_cmds | sed 's/ /|/g' | sed 's/+/\\+/g'))$" | _fzf_orig_completion_filter)
-  export _fzf_completion_loaded=0.8.6-1
+  export _fzf_completion_loaded=0.9.12
 fi
 
 if type _completion_loader > /dev/null 2>&1; then
diff --git a/src/constants.go b/src/constants.go
index e3b4c86..b0710af 100644
--- a/src/constants.go
+++ b/src/constants.go
@@ -8,7 +8,7 @@ import (
 
 const (
 	// Current version
-	Version = "0.9.11"
+	Version = "0.9.12"
 
 	// Core
 	coordinatorDelayMax  time.Duration = 100 * time.Millisecond