summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2015-09-18 10:25:07 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2015-09-18 10:25:07 +0900
commitca19762e58533c6d7c7b25d7fcc41dc7ea898b3e (patch)
tree11a5fafed5d71ce02014b5b96af5c806ed76d121
parent8764be07e2c97b667bd8437417e0a592082a918d (diff)
downloadfzf-ca19762e58533c6d7c7b25d7fcc41dc7ea898b3e.tar.gz
Exit status 130 when fzf is terminated by the user
Related: #345
-rw-r--r--plugin/fzf.vim5
-rw-r--r--src/constants.go7
-rw-r--r--src/terminal.go2
3 files changed, 8 insertions, 6 deletions
diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index e6aecf40..d9ced8ef 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -228,10 +228,11 @@ function! s:execute(dict, command, temps)
execute 'silent !'.command
redraw!
if v:shell_error
- " Do not print error message on exit status 1
- if v:shell_error > 2
+ " Do not print error message on exit status 1 (no match) or 130 (interrupt)
+ if v:shell_error == 2
echohl ErrorMsg
echo 'Error running ' . command
+ echohl None
endif
return []
else
diff --git a/src/constants.go b/src/constants.go
index 9a4fc29f..1cc4f81f 100644
--- a/src/constants.go
+++ b/src/constants.go
@@ -49,7 +49,8 @@ const (
)
const (
- exitOk = 0
- exitNoMatch = 1
- exitError = 2
+ exitOk = 0
+ exitNoMatch = 1
+ exitError = 2
+ exitInterrupt = 130
)
diff --git a/src/terminal.go b/src/terminal.go
index 5e8300f9..9a92ba43 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -791,7 +791,7 @@ func (t *Terminal) Loop() {
exit(exitNoMatch)
case reqQuit:
C.Close()
- exit(exitError)
+ exit(exitInterrupt)
}
}
t.placeCursor()