- Merged.

roman · Jul 11, 2011 · 010d983 · 010d983
2 parents 028d07f + 1dc9bfd
commit 010d983
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/autoload/vimshell/interactive.vim b/autoload/vimshell/interactive.vim
@@ -1,7 +1,11 @@
 "=============================================================================
 " FILE: interactive.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
+<<<<<<< HEAD
 " Last Modified: 12 Jul 2011.
+=======
+" Last Modified: 11 Jul 2011.
+>>>>>>> 1dc9bfd77f95a72515b6e9110a52e6b8f66e50da
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -78,10 +82,10 @@ endfunction"}}}
 
 function! vimshell#interactive#execute_pty_inout(is_insert)"{{{
   let l:in = vimshell#interactive#get_cur_line(line('.'))
+  call vimshell#history#append(l:in)
   if l:in !~ "\<C-d>$"
     let l:in .= "\<LF>"
   endif
-  call vimshell#history#append(l:in)
 
   call s:send_string(l:in, a:is_insert, line('.'))
 endfunction"}}}

diff --git a/doc/vimshell.txt b/doc/vimshell.txt
@@ -220,6 +220,9 @@ CHANGELOG						*vimshell-changelog*
 2011-07-12
 - Fixed :VimShellSendString error.
 
+2011-07-11
+- Fixed save interactive history.
+
 2011-07-10
 - Fixed cd internal command.