commit 6945834de57a73d683aff507b606837864f2bc2d
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2017-03-20T04:47:21Z |
|---|
| subject | Merge remote-tracking branch 'vim/master' into Astro |
|---|
commit 6945834de57a73d683aff507b606837864f2bc2d
Merge: 3b21cce 4311ff3
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2017-03-20T04:47:21Z
Merge remote-tracking branch 'vim/master' into Astro
.../src/Components/Vim/Actions/EDITOR_COMMAND.js | 5 ++-
botanjs/src/Components/Vim/Actions/MARK.js | 45 ++++++++++++++++++++++
botanjs/src/Components/Vim/Actions/MARKS.js | 4 +-
botanjs/src/Components/Vim/Actions/VISUAL.js | 6 +++
botanjs/src/Components/Vim/Controls.js | 28 ++++++--------
botanjs/src/Components/Vim/Cursor.js | 4 +-
botanjs/src/Components/Vim/Ex/Command.js | 2 +-
botanjs/src/Components/Vim/State/Marks.js | 8 +++-
botanjs/src/Components/Vim/VimArea.js | 2 +-
9 files changed, 80 insertions(+), 24 deletions(-)