diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2009-07-11 17:52:23 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2009-07-11 17:52:23 -0400 |
| commit | 741ce69b41705b7ad048283e6893ebcb693326fc (patch) | |
| tree | 154bf7ca189e93314ec839bffeaeafcb084d96c3 /core | |
| parent | cd1b08965356aceec0df029050cc7b073714247e (diff) | |
| download | textadept-741ce69b41705b7ad048283e6893ebcb693326fc.tar.gz textadept-741ce69b41705b7ad048283e6893ebcb693326fc.zip | |
Fixed bug with lexer restoration.
Diffstat (limited to 'core')
| -rw-r--r-- | core/ext/menu.lua | 6 | ||||
| -rw-r--r-- | core/ext/mime_types.lua | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/core/ext/menu.lua b/core/ext/menu.lua index 0fe2cfb5..654f3ba5 100644 --- a/core/ext/menu.lua +++ b/core/ext/menu.lua @@ -331,8 +331,8 @@ local function set_eol_mode(mode) buffer:convert_eo_ls(mode) t.events.update_ui() -- for updating statusbar end -local function set_lexer_language(lexer) - buffer:set_lexer_language(lexer) +local function set_lexer(lexer) + buffer:set_lexer(lexer) buffer:colourise(0, -1) t.events.update_ui() -- for updating statusbar end @@ -512,7 +512,7 @@ t.events.add_handler('menu_clicked', local active_table = actions[menu_id] if menu_id >= ID.LEXER_START and menu_id < ID.LEXER_START + 99 then active_table = - { set_lexer_language, lexer_menu[menu_id - ID.LEXER_START + 1][1] } + { set_lexer, lexer_menu[menu_id - ID.LEXER_START + 1][1] } end local f, args if active_table and #active_table > 0 then diff --git a/core/ext/mime_types.lua b/core/ext/mime_types.lua index 5b45b710..a1867437 100644 --- a/core/ext/mime_types.lua +++ b/core/ext/mime_types.lua @@ -50,15 +50,12 @@ end -- restored. -- @param buffer The buffer to set the lexer language of. -- @param lang The string language to set. -local function set_lexer_language(buffer, lang) +local function set_lexer(buffer, lang) buffer._lexer = lang - buffer:set_lexer_language_(lang) + buffer:set_lexer_language(lang) end textadept.events.add_handler('buffer_new', - function() - buffer.set_lexer_language_ = buffer.set_lexer_language - buffer.set_lexer_language = set_lexer_language - end) + function() buffer.set_lexer = set_lexer end) --- -- [Local function] Performs actions suitable for a new buffer. @@ -85,7 +82,7 @@ local function handle_new() end end end - buffer:set_lexer_language(lexer or 'container') + buffer:set_lexer(lexer or 'container') if buffer.filename then local lang = extensions[buffer.filename:match('[^/\\.]+$')] if lang then |