From 6169e7d42c434ef6a01b199e0f2729a25b389e43 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Mon, 14 Jun 2010 18:21:57 -0400
Subject: Fixes from Robert Gieseke.

---
 init.lua                          |  4 +---
 modules/textadept/menu.lua        |  2 +-
 modules/textadept/mime_types.conf | 12 ++++++------
 modules/textadept/session.lua     |  4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/init.lua b/init.lua
index 69b60ac2..46e3db83 100644
--- a/init.lua
+++ b/init.lua
@@ -10,9 +10,7 @@ local paths = {
 }
 package.path = table.concat(paths, ';')
 
-if not user_dofile('init.lua') then
-require 'textadept'
-end
+if not user_dofile('init.lua') then require 'textadept' end
 
 if not RESETTING then
   -- for Windows, create arg table from single command line string (arg[0])
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index de1a3a59..e3e5ee0d 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -5,7 +5,7 @@ local events = _G.events
 
 ---
 -- Provides dynamic menus for Textadept.
--- This module, like ext/key_commands, should be 'require'ed last.
+-- This module, like _m.textadept.keys, should be 'require'ed last.
 module('_m.textadept.menu', package.seeall)
 
 local gui = gui
diff --git a/modules/textadept/mime_types.conf b/modules/textadept/mime_types.conf
index 10f4a8bb..fda18029 100644
--- a/modules/textadept/mime_types.conf
+++ b/modules/textadept/mime_types.conf
@@ -231,12 +231,12 @@ pyw python
 #python python
 
 % R
-R r
-Rout r
-Rhistory r
-Rt r
-Rout.save r
-Rout.fail r
+R rstats
+Rout rstats
+Rhistory rstats
+Rt rstats
+Rout.save rstats
+Rout.fail rstats
 
 % Rebol
 r rebol
diff --git a/modules/textadept/session.lua b/modules/textadept/session.lua
index 22f19c11..ce347d24 100644
--- a/modules/textadept/session.lua
+++ b/modules/textadept/session.lua
@@ -31,7 +31,7 @@ local lfs = require 'lfs'
 -- @usage _m.textadept.session.load(filename)
 function load(filename)
   local not_found = {}
-  local f = io.open_file(filename or DEFAULT_SESSION, 'rb')
+  local f = io.open(filename or DEFAULT_SESSION, 'rb')
   if not f then
     if not io.close_all() then return false end
   end
@@ -160,7 +160,7 @@ function save(filename)
   session[#session + 1] = ("size: %d %d"):format(size[1], size[2])
   -- Write the session.
   local f =
-    io.open_file(filename or _SESSIONFILE or DEFAULT_SESSION, 'wb')
+    io.open(filename or _SESSIONFILE or DEFAULT_SESSION, 'wb')
   if f then
     f:write(table.concat(session, '\n'))
     f:close()
-- 
cgit v1.2.3