Merge branch 'master' into develop

Author: tstack

NEWS.md

@@ -69,7 +69,7 @@ Features:
 * The DB view now shows a status bar above the bottom
   status bar with the SQL query that populated the view,
   the relative time when it was run, and how long it took.
-  A reload icon at the left side of the bar can be clicked
+  A reload icon on the left side of the bar can be clicked
   to re-run the query.  For queries that read from log-backed
   tables, the status bar also calls out whether the results
   are "on current log data" or "on old log data" relative to
@@ -84,8 +84,29 @@ Features:
   - `⌘-X` to cut the current selection to the
     clipboard.
   - `⌘-Z` to undo the last change.
+* Additional readline-style key bindings in the
+  prompt (issue #1676):
+  - `ALT-f` / `ALT-b` move forward/backward by word.
+  - `ALT-d` cuts to the end of the next word.
+  - `ALT-BACKSPACE` is an alias for `CTRL-W`.
+  - `ALT-l` / `ALT-u` lower- or upper-case the
+    next word.
+  - `ALT-c` capitalizes the next word.
+  - `CTRL-h` and `CTRL-d` are aliases for
+    BACKSPACE and DELETE.
+  - `CTRL-t` transposes the two characters before
+    the cursor.
+* In the log message details (opened by pressing `p`),
+  a `File:` row has been added that lists the file and
+  line number the log message is from.  Also, for JSON
+  logs, you can focus on the `JSON fields:` row and
+  press `c` to copy the raw log message to the
+  clipboard.
 * The `measure_with_units` collator now recognizes
   (KiB, MiB, ...).
+* Added `disfavors` to `external-editor` configuration
+  to express file names that the editor is not interested
+  in handling.
 
 Breaking changes:
 * The `humanize_file_size()` SQLite function now
@@ -98,6 +119,8 @@ Bug Fixes:
   read and crash in some situations.
 * Fix a lockup when viewing a file that contained log
   messages and lots of binary data.
+* Update Regex101 import functionality to handle a
+  change in their API response.
 * More hardening for some diabolical inputs:
   - Unsupported escape-sequences were ignored before,
     but they are displayed now.

README.md

@@ -47,7 +47,7 @@ however, they do not understand log messages.  Tail can watch
 multiple files at a time, but it won't display messages in order by
 time and you can't scroll backwards.  Grep will only find matching
 lines, but won't return a full multi-line log message.  Less can only
-display a single file at a time.  Also, none of these basic tools 
+display a single file at a time.  Also, none of these basic tools
 handle compressed files.
 
 ## Try online before installing
@@ -59,7 +59,7 @@ an example:
 
 [`$ ssh playground@demo.lnav.org`](ssh://playground@demo.lnav.org)
 
-The "tutorial 1" account is an interactive tutorial that can teach 
+The "tutorial 1" account is an interactive tutorial that can teach
 you the basics of operation:
 
 [`$ ssh tutorial1@demo.lnav.org`](ssh://tutorial1@demo.lnav.org)
@@ -89,17 +89,17 @@ monitor, it will figure out the rest:
 $ lnav /path/to/file1 /path/to/dir ...
 ```
 
-The **lnav** TUI will pop up right away and begin indexing the 
-files. Progress is displayed in the "Files" panel at the 
-bottom. Once the indexing has finished, the LOG view will display 
-the log messages that were recognized[^1]. You can then use the 
+The **lnav** TUI will pop up right away and begin indexing the
+files. Progress is displayed in the "Files" panel at the
+bottom. Once the indexing has finished, the LOG view will display
+the log messages that were recognized[^1]. You can then use the
 usual hotkeys to move around the view (arrow keys or
 `j`/`k`/`h`/`l` to move down/up/left/right).
 
 See the [Usage section](https://docs.lnav.org/en/latest/usage.html)
 of the online documentation for more information.
 
-[^1]: Files that do not contain log messages can be seen in the 
+[^1]: Files that do not contain log messages can be seen in the
       TEXT view (reachable by pressing `t`).
 
 ### Usage with `systemd-journald`

docs/schemas/config-v1.schema.json

@@ -325,6 +325,15 @@
                                         },
                                         "prefers": {
                                             "title": "/tuning/external-editor/impls/<editor_impl_name>/prefers",
+                                            "description": "Regular expression that matches file names preferred by this editor",
+                                            "type": "string",
+                                            "examples": [
+                                                "^.*(?:\\.cpp)$"
+                                            ]
+                                        },
+                                        "disfavors": {
+                                            "title": "/tuning/external-editor/impls/<editor_impl_name>/disfavors",
+                                            "description": "Regular expression that matches file names not favored by this editor",
                                             "type": "string",
                                             "examples": [
                                                 "^.*(?:\\.cpp)$"

docs/source/hotkeys.rst

@@ -393,6 +393,12 @@ editing:
     * - :kbd:`Shift` + :kbd:`→`
       -
       - Move right one character and include it in the selection
+    * - :kbd:`Alt` + :kbd:`←`
+      - :kbd:`Alt` + :kbd:`b`
+      - Move to the start of the previous word
+    * - :kbd:`Alt` + :kbd:`→`
+      - :kbd:`Alt` + :kbd:`f`
+      - Move to the start of the next word
     * - :kbd:`↑`
       - :kbd:`Ctrl` + :kbd:`P`
       - In single-line mode, search the history with the current contents.
@@ -408,15 +414,30 @@ editing:
     * - :kbd:`Ctrl` + :kbd:`E`
       -
       - Move to the end of the line
+    * - :kbd:`Ctrl` + :kbd:`T`
+      -
+      - Transpose the two characters before the cursor
+    * - :kbd:`Alt` + :kbd:`l`
+      -
+      - Convert the next word to lower-case and move to the end of it
+    * - :kbd:`Alt` + :kbd:`u`
+      -
+      - Convert the next word to upper-case and move to the end of it
+    * - :kbd:`Alt` + :kbd:`c`
+      -
+      - Capitalize the next word and move to the end of it
     * - :kbd:`Ctrl` + :kbd:`K`
       -
       - Cut to the end of the line into the clipboard
     * - :kbd:`Ctrl` + :kbd:`U`
       -
       - Cut from the beginning of the line to the cursor into the clipboard
     * - :kbd:`Ctrl` + :kbd:`W`
-      -
+      - :kbd:`Alt` + :kbd:`Backspace`
       - Cut from the beginning of the previous word into the clipboard
+    * - :kbd:`Alt` + :kbd:`d`
+      -
+      - Cut to the end of the next word into the clipboard
     * - :kbd:`Ctrl` + :kbd:`Y`
       -
       - Paste the clipboard contents

src/base/ansi_scrubber.cc

@@ -329,7 +329,7 @@ scrub_ansi_string(std::string& str, string_attrs_t* sa)
                             lr.lr_end = cp_dst;
                             tmp_sa.emplace_back(
                                 lr,
-                                SA_UNSUPPORTED.value(fmt::format(
+                                SAT_UNSUPPORTED.value(fmt::format(
                                     FMT_STRING("ANSI sequence: OSC {} {}"),
                                     md[3],
                                     md[4])));
@@ -497,7 +497,7 @@ scrub_ansi_string(std::string& str, string_attrs_t* sa)
                         lr.lr_end = cp_dst;
                         tmp_sa.emplace_back(
                             lr,
-                            SA_UNSUPPORTED.value(fmt::format(
+                            SAT_UNSUPPORTED.value(fmt::format(
                                 FMT_STRING("ANSI sequence: ESC [ {} {}"),
                                 seq,
                                 terminator)));