Fix grid goto result, and hurr durr markdown.
| author |
Steve Losh <steve@stevelosh.com> |
| date |
Mon, 13 Jun 2011 19:05:27 -0400 |
| parents |
3a2ecf1356ef
|
| children |
83130fbbc7f9
|
| branches/tags |
(none) |
| files |
README.markdown plugin/threesomelib/modes.py |
Changes
--- a/README.markdown Mon Jun 13 18:56:09 2011 -0400
+++ b/README.markdown Mon Jun 13 19:05:27 2011 -0400
@@ -17,11 +17,11 @@
It's designed to be used as a merge tool for version control systems like
Mercurial and Git.
-**Source (Mercurial):** <http://bitbucket.org/sjl/threesome.vim>
-**Source (Git):** <http://github.com/sjl/threesome.vim>
-**Issues:** <http://github.com/sjl/threesome.vim/issues>
-**License:** MIT X11
-**Full Documentation:** `:help threesome`
+* **Source (Mercurial):** <http://bitbucket.org/sjl/threesome.vim>
+* **Source (Git):** <http://github.com/sjl/threesome.vim>
+* **Issues:** <http://github.com/sjl/threesome.vim/issues>
+* **License:** MIT X11
+* **Full Documentation:** `:help threesome`
Requirements
============
--- a/plugin/threesomelib/modes.py Mon Jun 13 18:56:09 2011 -0400
+++ b/plugin/threesomelib/modes.py Mon Jun 13 19:05:27 2011 -0400
@@ -164,13 +164,13 @@
Layout 0 Layout 1 Layout 2
+-------------------+ +--------------------------+ +---------------+
| Original | | One | Result | Two | | One |
- |1 | | | | | |1 |
+ |2 | | | | | |2 |
+-------------------+ | | | | +---------------+
| One | Two | | | | | | Result |
- |2 |3 | | | | | |2 |
+ |3 |4 | | | | | |3 |
+-------------------+ | | | | +---------------+
| Result | | | | | | Two |
- |4 | |1 |2 |3 | |3 |
+ |5 | |2 |3 |4 | |4 |
+-------------------+ +--------------------------+ +---------------+
"""
@@ -315,11 +315,11 @@
def goto_result(self):
if self._current_layout == 0:
- windows.focus(4)
+ windows.focus(5)
elif self._current_layout == 1:
- windows.focus(2)
+ windows.focus(3)
elif self._current_layout == 2:
- windows.focus(2)
+ windows.focus(3)
def hud_diagram(self):
@@ -600,6 +600,7 @@
def goto_result(self):
self.key_result()
+
def hud_diagram(self):
bufmap = { buffers.original.name: 'Original',
buffers.one.name: 'One',