aboutsummaryrefslogtreecommitdiffhomepage
path: root/core
diff options
context:
space:
mode:
authorGravatar mitchell <70453897+667e-11@users.noreply.github.com>2013-06-24 15:33:41 -0400
committerGravatar mitchell <70453897+667e-11@users.noreply.github.com>2013-06-24 15:33:41 -0400
commit8527adcebc33243664bcb2b19d63ac6a66e584be (patch)
treec0dae28fa47a8b0178420f4d65a44842d1e2a204 /core
parent9eac2fc9173845e73c8e55aec9be66c9a233da2d (diff)
Removed `_G.RESETTING`; test for `arg` instead.
Diffstat (limited to 'core')
-rw-r--r--core/gui.lua1
-rw-r--r--core/init.lua10
2 files changed, 3 insertions, 8 deletions
diff --git a/core/gui.lua b/core/gui.lua
index 59ad72d5..b8b2071e 100644
--- a/core/gui.lua
+++ b/core/gui.lua
@@ -192,7 +192,6 @@ function gui.set_theme(name, ...)
for j = 1, #props, 2 do buffer.property[props[j]] = props[j + 1] end
end
gui.goto_view(current_view)
--- if not RESETTING then reset() end
theme = name
end
diff --git a/core/init.lua b/core/init.lua
index f4b96961..83c6bed5 100644
--- a/core/init.lua
+++ b/core/init.lua
@@ -35,9 +35,6 @@ if jit then module, package.searchers, bit32 = nil, package.loaders, bit end
-- @field _CHARSET (string)
-- The character set encoding of the filesystem.
-- This is used when [working with files](io.html).
--- @field RESETTING (bool)
--- If [`reset()`](#reset) has been called, this flag is `true` while the Lua
--- state is being re-initialized.
-- @field WIN32 (bool)
-- If Textadept is running on Windows, this flag is `true`.
-- @field OSX (bool)
@@ -108,11 +105,10 @@ local quit
-- files that use them will reload those modules instead.
-- This function is useful for modifying user scripts (such as
-- *~/.textadept/init.lua* and *~/.textadept/modules/textadept/keys.lua*) on
--- the fly without having to restart Textadept. `_G.RESETTING` is set to `true`
--- when re-initing the Lua State. Any scripts that need to differentiate between
--- startup and reset can utilize this variable.
+-- the fly without having to restart Textadept. `arg` is set to `nil` when
+-- reinitializing the Lua State. Any scripts that need to differentiate between
+-- startup and reset can test `arg`.
-- @class function
--- @see RESETTING
-- @name reset
local reset