diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-03-27 12:11:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-03-27 12:11:33 +0100 |
| commit | 7007e31bde75b6360a1b54c7572e4f855458f37d (patch) | |
| tree | 0119498d79dd4ea241d54d85c1d35ad434ff8fa3 /src/main.c | |
| parent | bb5d87c8504588be9c9d2fecc5b6455a2b2f6201 (diff) | |
patch 8.2.2662: there is no way to avoid some escape sequencesv8.2.2662
Problem: There is no way to avoid some escape sequences.
Solution: Suppress escape sequences when the --not-a-term argument is used.
(Gary Johnson)
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c index 369741abad..30014d4be2 100644 --- a/src/main.c +++ b/src/main.c @@ -995,6 +995,19 @@ is_not_a_term() return params.not_a_term; } +/* + * Return TRUE when the --not-a-term argument was found or the GUI is in use. + */ + static int +is_not_a_term_or_gui() +{ + return params.not_a_term +#ifdef FEAT_GUI + || gui.in_use +#endif + ; +} + // When TRUE in a safe state when starting to wait for a character. static int was_safe = FALSE; @@ -1528,9 +1541,7 @@ getout(int exitval) #endif // Position the cursor on the last screen line, below all the text -#ifdef FEAT_GUI - if (!gui.in_use) -#endif + if (!is_not_a_term_or_gui()) windgoto((int)Rows - 1, 0); #if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) @@ -1640,9 +1651,7 @@ getout(int exitval) } // Position the cursor again, the autocommands may have moved it -#ifdef FEAT_GUI - if (!gui.in_use) -#endif + if (!is_not_a_term_or_gui()) windgoto((int)Rows - 1, 0); #ifdef FEAT_JOB_CHANNEL |