diff options
| -rw-r--r-- | CHANGELOG.md | 16 | ||||
| -rw-r--r-- | FAQ.md | 18 | ||||
| -rw-r--r-- | core/._M.luadoc | 12 | ||||
| -rw-r--r-- | core/keys.lua | 6 | ||||
| -rw-r--r-- | modules/textadept/keys.lua | 2 |
5 files changed, 27 insertions, 27 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dbde148..38716378 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,8 +66,8 @@ Changes: * Modules: Improved in-place editing of files during comparison. * Scintilla: added [`lexer.colors`][] and [`lexer.styles`][] tables for use in themes. Also added new way to [define and reference styles][]. -* Scintilla: added [`lexer.fold*`][] options instead of setting view properties. -* Scintilla: optimized performance when opening huge files. +* Scintilla: Added [`lexer.fold*`][] options instead of setting view properties. +* Scintilla: Optimized performance when opening huge files. * Scintilla: Added [`buffer.eol_annotation_text`][] analogue to `buffer.annotation_text`, but for EOL annotations. * Scintilla: Display DEL control characters like other control characters. @@ -2070,7 +2070,7 @@ Changes: * Support bracketed paste in the terminal version. * Allow handling of unknown [CSI events][]. * Added mouse support for buffers and eliminated many - [curses incompatibilities][]. + [terminal version incompatibilities][]. * Added [`_G.LINUX`][] and [`_G.BSD`][] platform flags for the sake of completeness. * [Rectangular selections][] with the mouse on Linux use the `Alt` modifier key @@ -2096,7 +2096,7 @@ Changes: [PGP -- 7.8 beta Modules]: download/textadept_7.8_beta.modules.zip.asc [`ui.command_entry.editing_keys`]: api.html#ui.command_entry.editing_keys [CSI events]: api.html#events.CSI -[curses incompatibilities]: manual.html#Curses.Compatibility +[terminal version incompatibilities]: manual.html#Terminal.Version.Compatibility [`_G.LINUX`]: api.html#LINUX [`_G.BSD`]: api.html#BSD [Rectangular selections]: manual.html#Rectangular.Selection @@ -2900,7 +2900,7 @@ Download: Bugfixes: * Fixed bug in user theme loading. -* Fixed "Enter" key autocompletion in curses. +* Fixed "Enter" key autocompletion in the terminal version. * Fixed crash when transposing in an empty buffer. * Fixed bug in find and run double-click event handlers. @@ -2996,7 +2996,7 @@ Bugfixes: * Command entry loses focus less often. * Allow empty tables as keychains if they have metatables. * Fixed caret placement in block comment/uncomment. -* Use '\n' keycode in curses instead of '\r'. +* Use '\n' keycode in the terminal version instead of '\r'. * Fixed crash caused by split views. * Scintilla: fixed typing into multiple carets in virtual space. @@ -3037,7 +3037,7 @@ Download: Bugfixes: * Fixed rendering on Mac OSX retina displays. -* Fixed rectangle indicator display in curses. +* Fixed rectangle indicator display in the terminal version. * Fixed Fn key recognition on Mac OSX. * Fixed compile errors for Mac OSX. * Find Previous for Lua patterns works. @@ -3047,7 +3047,7 @@ Changes: * Textadept supports multiple curses platforms, not just ncurses. Make targets now use "curses" instead of "ncurses". * Better 16-color terminal support in lexer theme. -* Reduced the delay when pressing `Esc` in curses. +* Reduced the delay when pressing `Esc` in the terminal version. * [Messagebox][] dialogs can show icons via `--icon` and `--icon-file`. * New Win32 terminal version. * New [key modes][] functionality. @@ -82,7 +82,7 @@ your [preferences][]. - - - **Q:** -In the curses version on Linux, pressing `^Z` suspends Textadept instead of +In the terminal version on Linux, pressing `^Z` suspends Textadept instead of performing an "Undo" action. How can I disable suspend and perform "Undo" instead? @@ -97,7 +97,7 @@ Place the following in your `~/.textadept/init.lua` file: - - - **Q:** -In Linux, middle-clicking in the curses version does not paste the primary +In Linux, middle-clicking in the terminal version does not paste the primary selection and selecting text does copy to the primary selection. All other terminal apps support this functionality, why not Textadept? @@ -109,8 +109,8 @@ application. - - - **Q:** -The curses version does not support feature _x_ the GUI version does. Is this a -bug? +The terminal version does not support feature _x_ the GUI version does. Is this +a bug? **A:** Maybe. Some terminals do not recognize certain key sequences like `Shift+Arrow` @@ -119,17 +119,17 @@ for making selections. Linux's virtual terminals (the ones accessible with seem to work fine. rxvt and rxvt-unicode do not work out of the box, but may be configurable. -Please see the [curses compatibility][] section of the appendix. If the feature -in question is not listed there, it may be a bug. Please [contact][] me with any -bug reports. +Please see the [terminal version compatibility][] section of the appendix. If +the feature in question is not listed there, it may be a bug. Please [contact][] +me with any bug reports. -[curses compatibility]: manual.html#Curses.Compatibility +[terminal version compatibility]: manual.html#Terminal.Version.Compatibility [contact]: README.html#Contact - - - **Q:** -Pressing `^O` in the curses version on macOS does not do anything. Why? +Pressing `^O` in the terminal version on macOS does not do anything. Why? **A:** For whatever reason, `^O` is discarded by the terminal driver. To enable it, run diff --git a/core/._M.luadoc b/core/._M.luadoc index afbe5779..d637da3c 100644 --- a/core/._M.luadoc +++ b/core/._M.luadoc @@ -97,7 +97,7 @@ -- Additional editing features for the language can be useful. For example, a -- C++ module might have a feature to add a ';' to the end of the current line -- and insert a new line. This command could be bound to the `Shift+Enter` (`⇧↩` --- on macOS | `S-Enter` in curses) key for easy access: +-- on macOS | `S-Enter` in the terminal version) key for easy access: -- -- keys.cpp = { -- ['s\n'] = function() @@ -108,11 +108,11 @@ -- } -- -- When defining key bindings for other commands, you may make use of a `Ctrl+L` --- (`⌘L` on macOS | `M-L` in curses) keychain. Traditionally this prefix has --- been reserved for use by language modules (although neither Textadept nor its --- modules utilize it at the moment). Users may define this keychain for new or --- existing modules and it will not conflict with any default key bindings. --- For example: +-- (`⌘L` on macOS | `M-L` in the terminal version) keychain. Traditionally this +-- prefix has been reserved for use by language modules (although neither +-- Textadept nor its modules utilize it at the moment). Users may define this +-- keychain for new or existing modules and it will not conflict with any +-- default key bindings. For example: -- -- keys.lua[CURSES and 'meta+l' or OSX and 'cmd+l' or 'ctrl+l'] = { -- ... diff --git a/core/keys.lua b/core/keys.lua index 16c2053e..ecf98eaa 100644 --- a/core/keys.lua +++ b/core/keys.lua @@ -28,9 +28,9 @@ local M = {} -- -- Key sequences are strings built from an ordered combination of modifier keys -- and the key's inserted character. Modifier keys are "Control", "Shift", and --- "Alt" on Windows, Linux, BSD, and in curses. On macOS they are "Control" --- (`^`), "Alt/Option" (`⌥`), "Command" (`⌘`), and "Shift" (`⇧`). These --- modifiers have the following string representations: +-- "Alt" on Windows, Linux, BSD, and in the terminal version. On macOS they are +-- "Control" (`^`), "Alt/Option" (`⌥`), "Command" (`⌘`), and "Shift" (`⇧`). +-- These modifiers have the following string representations: -- -- Modifier | Linux / Win32 | macOS | Terminal | -- ---------|---------------|-----------|-----------| diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua index 741b3533..61e0356a 100644 --- a/modules/textadept/keys.lua +++ b/modules/textadept/keys.lua @@ -210,7 +210,7 @@ local M = {} -- -- †: Some terminals interpret ^Z as suspend; see FAQ for workaround. -- --- ‡: Ctrl+Enter in Win32 curses. +-- ‡: Ctrl+Enter in Windows terminal version. module('textadept.keys')]] -- Windows and Linux key bindings. |