5 files changed, 13 insertions, 13 deletions
diff --git a/modules/textadept/bookmarks.lua b/modules/textadept/bookmarks.lua
index 9f2d1c10..c11f0fa5 100644
--- a/modules/textadept/bookmarks.lua
+++ b/modules/textadept/bookmarks.lua
@@ -62,7 +62,7 @@ function M.goto_mark(next)
           while line >= 0 do
             local mark = string.format('%s:%d: %s', basename, line + 1,
                                        buffer:get_line(line):match('^[^\r\n]*'))
-            utf8_list[#utf8_list + 1], buffers[#utf8_list + 1] = mark, i
+            utf8_list[#utf8_list + 1], buffers[#utf8_list + 1] = mark, buffer
             line = buffer:marker_next(line + 1, 2^M.MARK_BOOKMARK)
           end
         end
diff --git a/modules/textadept/find.lua b/modules/textadept/find.lua
index cc73964e..6b4efeee 100644
--- a/modules/textadept/find.lua
+++ b/modules/textadept/find.lua
@@ -408,10 +408,10 @@ local function is_ff_buf(buf) return buf._type == _L['[Files Found Buffer]'] end
 function M.goto_file_found(line, next)
   local ff_view, ff_buf = nil, nil
   for i = 1, #_VIEWS do
-    if is_ff_buf(_VIEWS[i].buffer) then ff_view = i break end
+    if is_ff_buf(_VIEWS[i].buffer) then ff_view = _VIEWS[i] break end
   end
   for i = 1, #_BUFFERS do
-    if is_ff_buf(_BUFFERS[i]) then ff_buf = i break end
+    if is_ff_buf(_BUFFERS[i]) then ff_buf = _BUFFERS[i] break end
   end
   if not ff_view and not ff_buf then return end
   if ff_view then ui.goto_view(ff_view) else view:goto_buffer(ff_buf) end
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index e09c6ca4..6f3346d9 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -257,8 +257,8 @@ local default_menubar = {
   },
   {
     title = _L['_Buffer'],
-    {_L['_Next Buffer'], function() view:goto_buffer(1, true) end},
-    {_L['_Previous Buffer'], function() view:goto_buffer(-1, true) end},
+    {_L['_Next Buffer'], function() view:goto_buffer(1) end},
+    {_L['_Previous Buffer'], function() view:goto_buffer(-1) end},
     {_L['_Switch to Buffer...'], ui.switch_buffer},
     SEPARATOR,
     {
@@ -303,8 +303,8 @@ local default_menubar = {
   },
   {
     title = _L['_View'],
-    {_L['_Next View'], function() ui.goto_view(1, true) end},
-    {_L['_Previous View'], function() ui.goto_view(-1, true) end},
+    {_L['_Next View'], function() ui.goto_view(1) end},
+    {_L['_Previous View'], function() ui.goto_view(-1) end},
     SEPARATOR,
     {_L['Split View _Horizontal'], function() view:split() end},
     {_L['Split View _Vertical'], function() view:split(true) end},
diff --git a/modules/textadept/run.lua b/modules/textadept/run.lua
index f7119a23..db5c48af 100644
--- a/modules/textadept/run.lua
+++ b/modules/textadept/run.lua
@@ -349,10 +349,10 @@ function M.goto_error(line, next)
   if not cwd then return end -- no previously run command
   local msg_view, msg_buf = nil, nil
   for i = 1, #_VIEWS do
-    if is_msg_buf(_VIEWS[i].buffer) then msg_view = i break end
+    if is_msg_buf(_VIEWS[i].buffer) then msg_view = _VIEWS[i] break end
   end
   for i = 1, #_BUFFERS do
-    if is_msg_buf(_BUFFERS[i]) then msg_buf = i break end
+    if is_msg_buf(_BUFFERS[i]) then msg_buf = _BUFFERS[i] break end
   end
   if not msg_view and not msg_buf then return end
   if msg_view then ui.goto_view(msg_view) else view:goto_buffer(msg_buf) end
diff --git a/modules/textadept/session.lua b/modules/textadept/session.lua
index e497aad0..11515de0 100644
--- a/modules/textadept/session.lua
+++ b/modules/textadept/session.lua
@@ -45,7 +45,7 @@ function M.load(filename)
   local f = io.open(filename, 'rb')
   if not f or not io.close_all_buffers() then return false end
   io.recent_files = {}
-  local current_view, splits = 1, {[0] = {}}
+  local current_view, splits = view, {[0] = {}}
   for line in f:lines() do
     if line:find('^buffer:') then
       local patt = '^buffer: (%d+) (%d+) (%d+) (.+)$'
@@ -76,7 +76,7 @@ function M.load(filename)
     elseif line:find('^%s*split%d:') then
       local level, num, type, size = line:match('^(%s*)split(%d): (%S+) (%d+)')
       local view = splits[#level] and splits[#level][tonumber(num)] or view
-      ui.goto_view(_VIEWS[view])
+      ui.goto_view(view)
       splits[#level + 1] = {view:split(type == 'true')}
       splits[#level + 1][1].size = tonumber(size) -- could be 1 or 2
     elseif line:find('^%s*view%d:') then
@@ -84,9 +84,9 @@ function M.load(filename)
       local view = splits[#level][tonumber(num)] or view
       buf_idx = tonumber(buf_idx)
       if buf_idx > #_BUFFERS then buf_idx = #_BUFFERS end
-      view:goto_buffer(buf_idx)
+      view:goto_buffer(_BUFFERS[buf_idx])
     elseif line:find('^current_view:') then
-      current_view = tonumber(line:match('^current_view: (%d+)')) or 1
+      current_view = _VIEWS[tonumber(line:match('^current_view: (%d+)')) or 1]
     elseif line:find('^recent:') then
       io.recent_files[#io.recent_files + 1] = line:match('^recent: (.+)$')
     end