diff options
| -rw-r--r-- | core/._SCINTILLA.luadoc | 2 | ||||
| -rw-r--r-- | core/.buffer.luadoc | 4 | ||||
| -rw-r--r-- | core/events.lua | 15 | ||||
| -rw-r--r-- | doc/09_Themes.md | 2 | ||||
| -rw-r--r-- | modules/textadept/adeptsense.lua | 2 |
5 files changed, 13 insertions, 12 deletions
diff --git a/core/._SCINTILLA.luadoc b/core/._SCINTILLA.luadoc index 7ff296db..4a2c7587 100644 --- a/core/._SCINTILLA.luadoc +++ b/core/._SCINTILLA.luadoc @@ -34,7 +34,7 @@ -- * `_G._SCINTILLA.constants.INDIC_TT` 2 -- * `_G._SCINTILLA.constants.MARKER_MAX` 31 -- * `_G._SCINTILLA.constants.FIND_MATCHCASE` 4 --- * `_G._SCINTILLA.constants.FIND_REGEXP` 4194304 +-- * `_G._SCINTILLA.constants.FIND_REGEXP` 6291456 -- * `_G._SCINTILLA.constants.FIND_WHOLEWORD` 2 -- * `_G._SCINTILLA.constants.FIND_WORDSTART` 1048576 -- * `_G._SCINTILLA.constants.MOD_ALT` 4 diff --git a/core/.buffer.luadoc b/core/.buffer.luadoc index 1d3b946d..b1265c2e 100644 --- a/core/.buffer.luadoc +++ b/core/.buffer.luadoc @@ -66,7 +66,7 @@ -- -- The default value is `buffer.ANNOTATION_HIDDEN`. -- @field auto_c_auto_hide (bool) --- Automatically hide the autocompletion or user list when no entries match +-- Automatically cancel the autocompletion or user list when no entries match -- typed text. -- The default value is `true`. -- @field auto_c_cancel_at_start (bool) @@ -1448,7 +1448,7 @@ function fold_children(buffer, line, action) end function fold_line(buffer, line, action) end --- --- Types a Form Feed ("\f") character at the caret position. +-- Types a Form Feed character ("\f") at the caret position. -- @param buffer The buffer. function form_feed(buffer) end diff --git a/core/events.lua b/core/events.lua index fa037842..796c027d 100644 --- a/core/events.lua +++ b/core/events.lua @@ -34,9 +34,10 @@ local M = {} -- -- * _`uri`_: The UTF-8-encoded URI to open. -- @field AUTO_C_CHAR_DELETED (string) --- Emitted when deleting a character while the autocompletion list is active. --- @field AUTO_C_RELEASE (string) --- Emitted when canceling the autocompletion list. +-- Emitted when deleting a character while the autocompletion or user list is +-- active. +-- @field AUTO_C_CANCELED (string) +-- Emitted when canceling the autocompletion or user list. -- @field AUTO_C_SELECTION (string) -- Emitted when selecting an item in the autocompletion list and before -- inserting the selection. @@ -76,9 +77,9 @@ local M = {} -- -- * _`code`_: The numeric key code. -- * _`shift`_: The "Shift" modifier key is held down. --- * _`ctrl`_: The "Control"/"Command" modifier key is held down. +-- * _`ctrl`_: The "Control" modifier key is held down. -- * _`alt`_: The "Alt"/"Option" modifier key is held down. --- * _`meta`_: The "Control" modifier key on Mac OSX is held down. +-- * _`meta`_: The "Command" modifier key on Mac OSX is held down. -- @field DOUBLE_CLICK (string) -- Emitted after double-clicking the mouse button. -- Arguments: @@ -170,9 +171,9 @@ local M = {} -- -- * _`code`_: The numeric key code. -- * _`shift`_: The "Shift" modifier key is held down. --- * _`ctrl`_: The "Control"/"Command" modifier key is held down. +-- * _`ctrl`_: The "Control" modifier key is held down. -- * _`alt`_: The "Alt"/"Option" modifier key is held down. --- * _`meta`_: The "Control" modifier key on Mac OSX is held down. +-- * _`meta`_: The "Command" modifier key on Mac OSX is held down. -- @field MARGIN_CLICK (string) -- Emitted when clicking the mouse inside a sensitive margin. -- Arguments: diff --git a/doc/09_Themes.md b/doc/09_Themes.md index 6c245a34..95611798 100644 --- a/doc/09_Themes.md +++ b/doc/09_Themes.md @@ -30,7 +30,7 @@ display these standard colors. Override the default theme in your [*~/.textadept/init.lua*][] using the [`ui.set_theme()`][] function. For example: - ui.set_theme('dark') + ui.set_theme(not CURSES and 'dark' or 'custom_term') Either restart Textadept for changes to take effect or type [`reset()`][] in the [command entry][]. diff --git a/modules/textadept/adeptsense.lua b/modules/textadept/adeptsense.lua index 6983b4dd..b76335c3 100644 --- a/modules/textadept/adeptsense.lua +++ b/modules/textadept/adeptsense.lua @@ -826,7 +826,7 @@ function M.goto_ctag(sense, kind, title) end end -- Prompt the user to select a tag to jump to. - local columns = {'Name', 'Location'} + local columns = {_L['Name'], 'Location'} if adeptsense_kind == M.FUNCTION or adeptsense_kind == M.FIELD then table.insert(columns, 2, 'Class') end |