diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2010-06-18 16:57:05 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2010-06-18 16:57:05 -0400 |
| commit | 4d811a578baaae01c1aad34d9f3c176c40831841 (patch) | |
| tree | 52e6aeb9d568224d87809b528be4d4872718ac1f | |
| parent | 44d46d022675756783e3c007923a77446d52b7e7 (diff) | |
| download | textadept-4d811a578baaae01c1aad34d9f3c176c40831841.tar.gz textadept-4d811a578baaae01c1aad34d9f3c176c40831841.zip | |
Fixed bug with args and sessions.
| -rw-r--r-- | core/args.lua | 10 | ||||
| -rw-r--r-- | modules/textadept/mime_types.lua | 3 | ||||
| -rw-r--r-- | modules/textadept/session.lua | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/args.lua b/core/args.lua index 28ecfd4a..8599afe8 100644 --- a/core/args.lua +++ b/core/args.lua @@ -29,10 +29,7 @@ end -- Generates an 'arg_none' event when no args are present. -- @see register function process() - if #arg == 0 then - events.emit('arg_none') - return - end + local no_args = true local i = 1 while i <= #arg do local switch = switches[arg[i]] @@ -44,9 +41,11 @@ function process() i = i + n else io.open_file(arg[i]) + no_args = false end i = i + 1 end + if no_args then events.emit('arg_none') end end local function show_help() @@ -80,8 +79,7 @@ if MAC and arg[1] and arg[1]:find('^%-psn_0') then table.remove(arg, 1) end local userhome = os.getenv(not WIN32 and 'HOME' or 'USERPROFILE')..'/.textadept' for i = 1, #arg do if (arg[i] == '-u' or arg[i] == '--userhome') and arg[i + 1] then - userhome = table.remove(arg, i + 1) - table.remove(arg, i) + userhome = arg[i + 1] break end end diff --git a/modules/textadept/mime_types.lua b/modules/textadept/mime_types.lua index 96f56216..8c83c7a8 100644 --- a/modules/textadept/mime_types.lua +++ b/modules/textadept/mime_types.lua @@ -245,7 +245,8 @@ events.connect('file_opened', handle_new) events.connect('file_saved_as', handle_new) events.connect('buffer_after_switch', restore_lexer) events.connect('view_new', restore_lexer) -events.connect('reset_after', function() buffer:set_lexer(buffer._lexer) end) +events.connect('reset_after', + function() buffer:set_lexer(buffer._lexer or 'container') end) --- -- Prompts the user to select a lexer from a filtered list for the current diff --git a/modules/textadept/session.lua b/modules/textadept/session.lua index d3b7a1e4..5f5c4666 100644 --- a/modules/textadept/session.lua +++ b/modules/textadept/session.lua @@ -95,7 +95,8 @@ function load(filename) end return true end -events.connect('arg_none', load) -- load session when no args are present +events.connect('arg_none', -- load session when no args are present + function() if SAVE_ON_QUIT then load() end end) --- -- Saves a Textadept session to a file. |