diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-10-05 09:49:17 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-10-05 09:49:17 +0200 |
| commit | 73b50de925c10aaf0db2ffed47ec8459b0730cd1 (patch) | |
| tree | 93fb82598ecf1d227137cd093c16cc14b537e76c | |
| parent | 70e84a7c4c7bfad9b3a0ec18fd219f51205c03f8 (diff) | |
| download | rneovim-73b50de925c10aaf0db2ffed47ec8459b0730cd1.tar.gz rneovim-73b50de925c10aaf0db2ffed47ec8459b0730cd1.tar.bz2 rneovim-73b50de925c10aaf0db2ffed47ec8459b0730cd1.zip | |
'titleold': move logic to getout()
| -rw-r--r-- | src/nvim/main.c | 5 | ||||
| -rw-r--r-- | src/nvim/os_unix.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 024c56dd05..ea7a58bda3 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -649,6 +649,11 @@ void getout(int exitval) /* Position the cursor again, the autocommands may have moved it */ ui_cursor_goto((int)Rows - 1, 0); + // Apply 'titleold'. + if (p_title && *p_titleold != NUL) { + ui_call_set_title(cstr_as_string((char *)p_titleold)); + } + #if defined(USE_ICONV) && defined(DYNAMIC_ICONV) iconv_end(); #endif diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 2748de7329..692bcc97f4 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -15,7 +15,6 @@ #include <string.h> #include "nvim/api/private/handle.h" -#include "nvim/api/private/helpers.h" #include "nvim/vim.h" #include "nvim/ascii.h" #include "nvim/os_unix.h" @@ -138,9 +137,6 @@ void mch_exit(int r) FUNC_ATTR_NORETURN { exiting = true; - if (p_title && *p_titleold != NUL) { - ui_call_set_title(cstr_as_string((char *)p_titleold)); - } ui_builtin_stop(); ui_flush(); ml_close_all(true); // remove all memfiles |