Merge branch 'master' into devel

This commit is contained in:
Junegunn Choi 2017-04-30 11:23:42 +09:00
commit 33f32de690
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627

View File

@ -379,7 +379,9 @@ try
let use_term = 0 let use_term = 0
endif endif
if use_height if use_height
let optstr .= ' --height='.s:calc_size(&lines, dict.down, dict) let height = s:calc_size(&lines, dict.down, dict)
let $FZF_HEIGHT = height
let optstr .= ' --height='.height
elseif use_term elseif use_term
let optstr .= ' --no-height' let optstr .= ' --no-height'
endif endif