Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to version 2.3 #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to version 2.3 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1945765
Bumped to version 2.3, taken from http://conque.googlecode.com/files/…
Jan 12, 2012
c138006
Bumped to version 2.3, taken from http://conque.googlecode.com/files/…
Jan 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions autoload/conque_term.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
" FILE: autoload/conque_term.vim {{{
" AUTHOR: Nico Raffo <[email protected]>
" WEBSITE: http://conque.googlecode.com
" MODIFIED: 2011-08-12
" VERSION: 2.2, for Vim 7.0
" MODIFIED: 2011-09-02
" VERSION: 2.3, for Vim 7.0
" LICENSE:
" Conque - Vim terminal/console emulator
" Copyright (C) 2009-__YEAR__ Nico Raffo
" Copyright (C) 2009-2011 Nico Raffo
"
" MIT License
"
Expand Down Expand Up @@ -628,7 +628,8 @@ function! conque_term#set_mappings(action) "{{{
sil exe 'augroup ' . b:ConqueTerm_Var

" handle unexpected closing of shell, passes HUP to parent and all child processes
sil exe 'autocmd ' . b:ConqueTerm_Var . ' BufUnload <buffer> ' . s:py . ' ' . b:ConqueTerm_Var . '.close()'
sil exe 'autocmd ' . b:ConqueTerm_Var . ' BufDelete <buffer> call g:ConqueTerm_Terminals[' . b:ConqueTerm_Idx . '].close()'
sil exe 'autocmd ' . b:ConqueTerm_Var . ' BufUnload <buffer> call g:ConqueTerm_Terminals[' . b:ConqueTerm_Idx . '].close()'

" check for resized/scrolled buffer when entering buffer
sil exe 'autocmd ' . b:ConqueTerm_Var . ' BufEnter <buffer> ' . s:py . ' ' . b:ConqueTerm_Var . '.update_window_size()'
Expand Down Expand Up @@ -1403,13 +1404,16 @@ function! s:term_obj.close() dict " {{{
endtry

" delete buffer if option is set
if self.is_buffer
call conque_term#set_mappings('stop')
if exists('g:ConqueTerm_CloseOnEnd') && g:ConqueTerm_CloseOnEnd
sil exe 'bwipeout! ' . self.buffer_name
stopinsert!
try
if self.is_buffer
call conque_term#set_mappings('stop')
if exists('g:ConqueTerm_CloseOnEnd') && g:ConqueTerm_CloseOnEnd
sil exe 'bwipeout! ' . self.buffer_name
stopinsert!
endif
endif
endif
catch
endtry

" mark ourselves as inactive
let self.active = 0
Expand Down
Loading