From f3bb9601ac824c2ff8fa12e37029bb15177c6583 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Tue, 15 Jun 2010 13:21:56 -0400
Subject: Removed user_dofile() of keys and snippets.

---
 core/init.lua                  | 3 +--
 doc/manual/6_Startup.md        | 4 ----
 modules/textadept/keys.lua     | 9 +++------
 modules/textadept/snippets.lua | 2 --
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/core/init.lua b/core/init.lua
index 055e09b7..cb880579 100644
--- a/core/init.lua
+++ b/core/init.lua
@@ -10,8 +10,7 @@ if not lfs.attributes(_USERHOME) then lfs.mkdir(_USERHOME) end
 if not lfs.attributes(_USERHOME..'/init.lua') then
   local f = io.open(_USERHOME..'/init.lua', 'w')
   if f then
-    f:write("-- 'require' your modules here\n\n")
-    f:write("require 'textadept' -- should be 'require'd last\n")
+    f:write("require 'textadept'\n")
     f:close()
   end
 end
diff --git a/doc/manual/6_Startup.md b/doc/manual/6_Startup.md
index 4adbedc8..aff0ac1d 100644
--- a/doc/manual/6_Startup.md
+++ b/doc/manual/6_Startup.md
@@ -34,10 +34,6 @@ example:
 
     -- In ~/.textadept/init.lua
 
-    -- Load my modules in '~/.textadept/modules'.
-    require 'foo'
-    require 'bar'
-
     -- Do not load all of textadept's modules.
     --require 'textadept'
 
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 187f227c..0d65f76a 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -108,10 +108,9 @@ module('_m.textadept.keys', package.seeall)
 --
 -- ## Configuration
 --
--- It is not recommended to edit Textadept's `modules/textadept/keys.lua`. You
--- can either override or add to default key commands in your
--- `~/.textadept/keys.lua` or `require` a separate module in your
--- `~/.textadept/init.lua` instead of `modules/textadept/keys`.
+-- It is not recommended to edit Textadept's `modules/textadept/keys.lua`.
+-- Instead you can modify `_G.keys` from within your `~/.textadept/init.lua` or
+-- from a file `require`d by your `init.lua`.
 
 -- Windows and Linux key commands are listed in the first block.
 -- Mac OSX key commands are listed in the second block.
@@ -483,8 +482,6 @@ end
 -- @name _G.keys
 _G.keys = _M
 
-user_dofile('keys.lua') -- load user key commands
-
 -- Do not edit below this line.
 
 -- optimize for speed
diff --git a/modules/textadept/snippets.lua b/modules/textadept/snippets.lua
index 9dbe1988..f0da90e5 100644
--- a/modules/textadept/snippets.lua
+++ b/modules/textadept/snippets.lua
@@ -475,5 +475,3 @@ end
 -- @class table
 -- @name _G.snippets
 _G.snippets = _M
-
-user_dofile('snippets.lua') -- load user snippets
-- 
cgit v1.2.3