# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1383668976 28800
# Node ID 8e1c1dc358de2132b7fbc1adaf94f528e3238e4d
# Parent  01e68795c7a14b97ec2ebbd70b0fcb42d1adac61# Parent  ad486b93845118d443e4a516448d35bb52bf2267
Merge pull request #21 from killphi/fix_spliceinit_crash

Fixes several crash issues with the latest VIm versions

diff -r 01e68795c7a1 -r 8e1c1dc358de autoload/splicelib/util/bufferlib.py
--- a/autoload/splicelib/util/bufferlib.py	Wed Feb 06 11:16:24 2013 -0500
+++ b/autoload/splicelib/util/bufferlib.py	Tue Nov 05 08:29:36 2013 -0800
@@ -6,8 +6,11 @@
 
 class Buffer(object):
     def __init__(self, i):
-        self.number = i + 1
-        self._buffer = vim.buffers[i]
+        self.number = i
+        for b in vim.buffers:
+            if b.number == self.number:
+                self._buffer = b
+                break
         self.name = self._buffer.name
 
     def open(self, winnr=None):
@@ -34,23 +37,23 @@
 class _BufferList(object):
     @property
     def original(self):
-        return Buffer(0)
+        return Buffer(1)
 
     @property
     def one(self):
-        return Buffer(1)
+        return Buffer(2)
 
     @property
     def two(self):
-        return Buffer(2)
+        return Buffer(3)
 
     @property
     def result(self):
-        return Buffer(3)
+        return Buffer(4)
 
     @property
     def hud(self):
-        return Buffer(int(vim.eval("bufnr('__Splice_HUD__')")) - 1)
+        return Buffer(int(vim.eval("bufnr('__Splice_HUD__')")))
 
 
     @property