diff options
| -rw-r--r-- | core/file_io.lua | 4 | ||||
| -rw-r--r-- | modules/lua/commands.lua | 2 | ||||
| -rw-r--r-- | modules/textadept/keys.lua | 4 | ||||
| -rw-r--r-- | modules/textadept/mime_types.lua | 62 | ||||
| -rw-r--r-- | themes/dark/lexer.lua | 8 | ||||
| -rw-r--r-- | themes/light/lexer.lua | 8 | ||||
| -rw-r--r-- | themes/scite/lexer.lua | 11 |
7 files changed, 23 insertions, 76 deletions
diff --git a/core/file_io.lua b/core/file_io.lua index b6643f64..74d5b71f 100644 --- a/core/file_io.lua +++ b/core/file_io.lua @@ -15,8 +15,8 @@ module('io', package.seeall) -- UTF-8 is compatible with it. Problems may arise for files with more exotic -- encodings that may not be detected properly, if at all. When opening a file, -- the list of encodings tried before throwing a `conversion failed` error is in --- `core/file_io.lua`'s [`try_encodings`](#try_encodings). Textadept respects the --- detected encoding when saving the file. +-- `core/file_io.lua`'s [`try_encodings`](#try_encodings). Textadept respects +-- the detected encoding when saving the file. -- -- New files are saved as UTF-8 by default. -- diff --git a/modules/lua/commands.lua b/modules/lua/commands.lua index 26fb08a1..e8c11773 100644 --- a/modules/lua/commands.lua +++ b/modules/lua/commands.lua @@ -24,7 +24,7 @@ module('_m.lua.commands', package.seeall) -- -- #### Syntax -- --- Fields are recognized as Lua line comments of the form ``-- * `field_name` ``. +-- Fields are recognized as Lua comments of the form ``-- * `field_name` ``. -- Functions are recognized as Lua functions of the form `function func(args)` -- or `function namespace:func(args)`. `.`-completion shows autocompletion for -- both fields and functions using the first function syntax. `:`-completion diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua index baea06a8..67512b51 100644 --- a/modules/textadept/keys.lua +++ b/modules/textadept/keys.lua @@ -77,8 +77,8 @@ module('_m.textadept.keys', package.seeall) -- ## Key Command Precedence -- -- When searching for a key command to execute in the `keys` table, key commands --- in the current style have priority, followed by the ones in the current lexer, --- and finally the ones in the global table. +-- in the current style have priority, followed by the ones in the current +-- lexer, and finally the ones in the global table. -- -- ## Example -- diff --git a/modules/textadept/mime_types.lua b/modules/textadept/mime_types.lua index 372a305a..f066e46b 100644 --- a/modules/textadept/mime_types.lua +++ b/modules/textadept/mime_types.lua @@ -52,64 +52,10 @@ module('_m.textadept.mime_types', package.seeall) -- This module adds an extra function to `buffer`: -- -- * **buffer:set\_lexer** (language)<br /> --- Replacement for [`buffer:set_lexer_language()`][buffer_set_lexer_language].<br /> --- Sets a buffer._lexer field so it can be restored without querying the --- mime-types tables. Also if the user manually sets the lexer, it should be --- restored.<br /> --- Loads the language-specific module if it exists. --- - lang: The string language to set. --- --- [buffer_set_lexer_language]: buffer.html#buffer:set_lexer_language - --- Markdown: --- ## Overview --- --- Files can be recognized and associated with programming language lexers in --- three ways: --- --- * By file extension. --- * By keywords in the file's shebang (`#!/path/to/exe`) line. --- * By a pattern that matches the file's first line. --- --- If a lexer is not associated with a file you open, first make sure the lexer --- exists in `lexers/`. If it does not, you will need to write one. Consult the --- [lexer][lexer] module for a tutorial. --- --- [lexer]: ../modules/lexer.html --- --- ## Configuration Files --- --- Built-in mime-types are located in `core/ext/mime_types.conf`. You can --- override or add to them in your `~/.textadept/mime_types.conf`. --- --- #### Detection by File Extension --- --- file_ext lexer --- --- Note: `file_ext` should not start with a `.` (period). --- --- #### Detection by Shebang Keywords --- --- #shebang_word lexer --- --- Examples of `shebang_word`'s are `lua`, `ruby`, `python`. --- --- #### Detection by Pattern --- --- /pattern lexer --- --- Only the last space, the one separating the pattern from the lexer, is --- significant. No spaces in the pattern need to be escaped. --- --- ## Extras --- --- This module adds an extra function to `buffer`: --- --- * **buffer:set\_lexer** (language)<br /> --- Replacement for [`buffer:set_lexer_language()`][buffer_set_lexer_language].<br /> --- Sets a buffer._lexer field so it can be restored without querying the --- mime-types tables. Also if the user manually sets the lexer, it should be --- restored.<br /> +-- Replacement for [`buffer:set_lexer_language()`][buffer_set_lexer_language]. +-- <br /> Sets a buffer._lexer field so it can be restored without querying +-- the mime-types tables. Also if the user manually sets the lexer, it should +-- be restored.<br /> -- Loads the language-specific module if it exists. -- - lang: The string language to set. -- diff --git a/themes/dark/lexer.lua b/themes/dark/lexer.lua index 5338747e..f5a685a8 100644 --- a/themes/dark/lexer.lua +++ b/themes/dark/lexer.lua @@ -45,15 +45,15 @@ elseif OSX then font_face = '!Monaco' font_size = 12 end -style_default = style{ +style_default = style { font = font_face, size = font_size, fore = colors.white, back = colors.black } style_line_number = style { fore = colors.black, back = colors.grey } -style_bracelight = style { fore = color('66', '99', 'FF'), bold = true } -style_bracebad = style { fore = color('FF', '66', '99'), bold = true } +style_bracelight = style { fore = color('66', '99', 'FF'), bold = true } +style_bracebad = style { fore = color('FF', '66', '99'), bold = true } style_controlchar = style_nothing style_indentguide = style { fore = colors.grey, back = colors.white } -style_calltip = style { fore = colors.white, back = color('44', '44', '44') } +style_calltip = style { fore = colors.white, back = color('44', '44', '44') } diff --git a/themes/light/lexer.lua b/themes/light/lexer.lua index 30140535..a5a8c1c7 100644 --- a/themes/light/lexer.lua +++ b/themes/light/lexer.lua @@ -52,15 +52,15 @@ elseif OSX then font_face = '!Monaco' font_size = 12 end -style_default = style{ +style_default = style { font = font_face, size = font_size, fore = colors.black, back = colors.white } style_line_number = style { fore = colors.black, back = colors.grey } -style_bracelight = style { fore = color('66', '99', 'FF'), bold = true } -style_bracebad = style { fore = color('FF', '66', '99'), bold = true } +style_bracelight = style { fore = color('66', '99', 'FF'), bold = true } +style_bracebad = style { fore = color('FF', '66', '99'), bold = true } style_controlchar = style_nothing style_indentguide = style { fore = colors.grey, back = colors.white } -style_calltip = style { fore = colors.black, back = color('DD', 'DD', 'DD') } +style_calltip = style { fore = colors.black, back = color('DD', 'DD', 'DD') } diff --git a/themes/scite/lexer.lua b/themes/scite/lexer.lua index 2eeed7b2..2e45a8b4 100644 --- a/themes/scite/lexer.lua +++ b/themes/scite/lexer.lua @@ -44,15 +44,16 @@ elseif OSX then font_face = '!Monaco' font_size = 12 end -style_default = style{ +style_default = style { font = font_face, size = font_size, fore = colors.black, back = colors.white, } style_line_number = style { back = color('C0', 'C0', 'C0') } -style_bracelight = style { fore = color('00', '00', 'FF'), bold = true } -style_bracebad = style { fore = color('FF', '00', '00'), bold = true } +style_bracelight = style { fore = color('00', '00', 'FF'), bold = true } +style_bracebad = style { fore = color('FF', '00', '00'), bold = true } style_controlchar = style_nothing -style_indentguide = style { fore = color('C0', 'C0', 'C0'), back = colors.white } -style_calltip = style { fore = colors.white, back = color('44', '44', '44') } +style_indentguide = style { fore = color('C0', 'C0', 'C0'), + back = colors.white } +style_calltip = style { fore = colors.white, back = color('44', '44', '44') } |