Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of /media/97A7-BCFE/Projects/vim-plugins/vimshell

  • Loading branch information...
commit 782db4f36ba070795c7e3c5b2604f9cd9fb557db 2 parents d08cd9e + 24a1237
@Shougo Shougo authored
Showing with 10 additions and 5 deletions.
  1. +7 −5 autoload/vimshell/mappings.vim
  2. +3 −0  doc/vimshell.txt
View
12 autoload/vimshell/mappings.vim
@@ -1,7 +1,7 @@
"=============================================================================
" FILE: mappings.vim
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 16 Jun 2011.
+" Last Modified: 25 Jun 2011.
" License: MIT license {{{
" Permission is hereby granted, free of charge, to any person obtaining
" a copy of this software and associated documentation files (the
@@ -433,16 +433,18 @@ function! s:run_help()"{{{
endif
endfunction"}}}
function! s:paste_prompt()"{{{
- if match(getline('.'), vimshell#escape_match(vimshell#get_prompt())) < 0
+ let l:prompt = getline('.')
+ if l:prompt !~# vimshell#escape_match(vimshell#get_prompt())
return
endif
- if match(getline('$'), vimshell#escape_match(vimshell#get_prompt())) < 0
+ if getline('$') !~# vimshell#escape_match(vimshell#get_prompt())
+ \ || vimshell#get_prompt_command(getline('$')) != ''
" Insert prompt line.
- call append(line('$'), getline('.'))
+ call append(line('$'), l:prompt)
else
" Set prompt line.
- call setline(line('$'), getline('.'))
+ call setline(line('$'), l:prompt)
endif
$
endfunction"}}}
View
3  doc/vimshell.txt
@@ -217,6 +217,9 @@ BUGS *vimshell-bugs*
==============================================================================
CHANGELOG *vimshell-changelog*
+2011-06-25
+- Changed <Plug>(vimshell_paste_prompt) behavior.
+
2011-06-16
- Fixed open_file().
- Supported earthquake command.
Please sign in to comment.
Something went wrong with that request. Please try again.