diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2020-06-28 10:10:41 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2020-06-28 10:10:41 -0400 |
| commit | eef00d04d7f04d352b0df8055de4058a15b653f1 (patch) | |
| tree | 0a32ca64b568efc4bbc12bf6512c3d2d5597f406 | |
| parent | 19549f6e25b51bb6e3b3850804ace591a6d29809 (diff) | |
| download | textadept-eef00d04d7f04d352b0df8055de4058a15b653f1.tar.gz textadept-eef00d04d7f04d352b0df8055de4058a15b653f1.zip | |
Renamed `ui.bufstatusbar_text` to `ui.buffer_statusbar_text`.
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | core/ui.lua | 4 | ||||
| -rw-r--r-- | doc/manual.md | 3 | ||||
| -rw-r--r-- | src/textadept.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 18a782d7..fa9a34c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2757,7 +2757,7 @@ Changes: * Renamed `_M.textadept` to [`textadept`][]. * New [`events.INITIALIZED`][] event. * Renamed `buffer:get_style_name()` to `buffer.style_name`. -* Renamed `ui.docstatusbar_text` to [`ui.bufstatusbar_text`][]. +* Renamed `ui.docstatusbar_text` to `ui.bufstatusbar_text`. * Removed `textadept.bookmarks.BOOKMARK_COLOR`, `textadept.editing.HIGHLIGHT_COLOR`, and `textadept.run.ERROR_COLOR` while exposing their respective marker and indicator numbers for customization. @@ -2778,7 +2778,6 @@ Changes: [`ui`]: api.html#ui [`textadept`]: api.html#textadept [`events.INITIALIZED`]: api.html#events.INITIALIZED -[`ui.bufstatusbar_text`]: api.html#ui.bufstatusbar_text [`io` module]: api.html#io [CDK]: http://invisible-island.net/cdk/cdk.html diff --git a/core/ui.lua b/core/ui.lua index aa685e14..ee0042b3 100644 --- a/core/ui.lua +++ b/core/ui.lua @@ -19,7 +19,7 @@ local ui = ui -- The text on the clipboard. -- @field statusbar_text (string, Write-only) -- The text displayed in the statusbar. --- @field bufstatusbar_text (string, Write-only) +-- @field buffer_statusbar_text (string, Write-only) -- The text displayed in the buffer statusbar. -- @field maximized (bool) -- Whether or not Textadept's window is maximized. @@ -336,7 +336,7 @@ events_connect(events.UPDATE_UI, function(updated) local tabs = string.format( '%s %d', buffer.use_tabs and _L['Tabs:'] or _L['Spaces:'], buffer.tab_width) local enc = buffer.encoding or '' - ui.bufstatusbar_text = string.format( + ui.buffer_statusbar_text = string.format( text, _L['Line:'], line, max, _L['Col:'], col, lexer, eol, tabs, enc) end) diff --git a/doc/manual.md b/doc/manual.md index 75e3e70e..10717c16 100644 --- a/doc/manual.md +++ b/doc/manual.md @@ -2043,6 +2043,8 @@ lexers |Removed |N/A<sup>a</sup> \_cancel_current() |Renamed |[cancel_current()][] \_select() |Renamed |[select()][] \_paths |Renamed |[paths][] +**ui** | | +bufstatusbar\_text |Renamed |[buffer_statusbar_text][] **ui.find** | | find\_in\_files\_timeout |Removed |N/A **view** | | @@ -2071,6 +2073,7 @@ section below. [cancel_current()]: api.html#textadept.snippets.cancel_current [select()]: api.html#textadept.snippets.select [paths]: api.html#textadept.snippets.paths +[buffer_statusbar_text]: api.html#ui.buffer_statusbar_text #### Buffer Indexing Changes diff --git a/src/textadept.c b/src/textadept.c index f03de69f..2afb1b59 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -894,7 +894,7 @@ static int ui_newindex(lua_State *L) { SS(focused_view, SCI_COPYTEXT, lua_rawlen(L, 3), (sptr_t)text); } else if (strcmp(key, "statusbar_text") == 0) set_statusbar_text(lua_tostring(L, 3), 0); - else if (strcmp(key, "bufstatusbar_text") == 0) + else if (strcmp(key, "buffer_statusbar_text") == 0) set_statusbar_text(lua_tostring(L, 3), 1); else if (strcmp(key, "menubar") == 0) { #if GTK |