Mercurial > vim
comparison src/option.c @ 14479:3375a8cbb442 v8.1.0253
patch 8.1.0253: saving and restoring window title does not always work
commit https://github.com/vim/vim/commit/40385dbcdfb44885f2e9b83e1e0285aeb8a0c2a8
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Aug 7 22:31:44 2018 +0200
patch 8.1.0253: saving and restoring window title does not always work
Problem: Saving and restoring window title does not always work.
Solution: Use the stack push and pop commands. (Kouichi Iwamoto,
closes #3059)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 07 Aug 2018 22:45:06 +0200 |
| parents | d9e6eec551e1 |
| children | 0a3b9ecf7cb8 |
comparison
equal
deleted
inserted
replaced
| 14478:b35bae59c521 | 14479:3375a8cbb442 |
|---|---|
| 3190 p_term("t_op", T_OP) | 3190 p_term("t_op", T_OP) |
| 3191 p_term("t_RF", T_RFG) | 3191 p_term("t_RF", T_RFG) |
| 3192 p_term("t_RB", T_RBG) | 3192 p_term("t_RB", T_RBG) |
| 3193 p_term("t_RC", T_CRC) | 3193 p_term("t_RC", T_CRC) |
| 3194 p_term("t_RI", T_CRI) | 3194 p_term("t_RI", T_CRI) |
| 3195 p_term("t_Ri", T_SRI) | |
| 3195 p_term("t_RS", T_CRS) | 3196 p_term("t_RS", T_CRS) |
| 3197 p_term("t_RT", T_CRT) | |
| 3196 p_term("t_RV", T_CRV) | 3198 p_term("t_RV", T_CRV) |
| 3197 p_term("t_Sb", T_CSB) | 3199 p_term("t_Sb", T_CSB) |
| 3198 p_term("t_SC", T_CSC) | 3200 p_term("t_SC", T_CSC) |
| 3199 p_term("t_se", T_SE) | 3201 p_term("t_se", T_SE) |
| 3200 p_term("t_Sf", T_CSF) | 3202 p_term("t_Sf", T_CSF) |
| 3201 p_term("t_SH", T_CSH) | 3203 p_term("t_SH", T_CSH) |
| 3202 p_term("t_SI", T_CSI) | 3204 p_term("t_SI", T_CSI) |
| 3205 p_term("t_Si", T_SSI) | |
| 3203 p_term("t_so", T_SO) | 3206 p_term("t_so", T_SO) |
| 3204 p_term("t_SR", T_CSR) | 3207 p_term("t_SR", T_CSR) |
| 3205 p_term("t_sr", T_SR) | 3208 p_term("t_sr", T_SR) |
| 3209 p_term("t_ST", T_CST) | |
| 3206 p_term("t_Te", T_STE) | 3210 p_term("t_Te", T_STE) |
| 3207 p_term("t_te", T_TE) | 3211 p_term("t_te", T_TE) |
| 3208 p_term("t_ti", T_TI) | 3212 p_term("t_ti", T_TI) |
| 3209 p_term("t_Ts", T_STS) | 3213 p_term("t_Ts", T_STS) |
| 3210 p_term("t_ts", T_TS) | 3214 p_term("t_ts", T_TS) |
| 10412 */ | 10416 */ |
| 10413 #ifdef FEAT_MOUSE_TTY | 10417 #ifdef FEAT_MOUSE_TTY |
| 10414 mch_setmouse(FALSE); /* switch mouse off */ | 10418 mch_setmouse(FALSE); /* switch mouse off */ |
| 10415 #endif | 10419 #endif |
| 10416 #ifdef FEAT_TITLE | 10420 #ifdef FEAT_TITLE |
| 10417 mch_restore_title(3); /* restore window titles */ | 10421 mch_restore_title(SAVE_RESTORE_BOTH); /* restore window titles */ |
| 10418 #endif | 10422 #endif |
| 10419 #if defined(FEAT_XCLIPBOARD) && defined(FEAT_GUI) | 10423 #if defined(FEAT_XCLIPBOARD) && defined(FEAT_GUI) |
| 10420 /* When starting the GUI close the display opened for the clipboard. | 10424 /* When starting the GUI close the display opened for the clipboard. |
| 10421 * After restoring the title, because that will need the display. */ | 10425 * After restoring the title, because that will need the display. */ |
| 10422 if (gui.starting) | 10426 if (gui.starting) |
| 11217 { | 11221 { |
| 11218 save_p_isk = buf->b_p_isk; | 11222 save_p_isk = buf->b_p_isk; |
| 11219 buf->b_p_isk = NULL; | 11223 buf->b_p_isk = NULL; |
| 11220 } | 11224 } |
| 11221 /* | 11225 /* |
| 11222 * Always free the allocated strings. | 11226 * Always free the allocated strings. If not already initialized, |
| 11223 * If not already initialized, set 'readonly' and copy 'fileformat'. | 11227 * reset 'readonly' and copy 'fileformat'. |
| 11224 */ | 11228 */ |
| 11225 if (!buf->b_p_initialized) | 11229 if (!buf->b_p_initialized) |
| 11226 { | 11230 { |
| 11227 free_buf_options(buf, TRUE); | 11231 free_buf_options(buf, TRUE); |
| 11228 buf->b_p_ro = FALSE; /* don't copy readonly */ | 11232 buf->b_p_ro = FALSE; /* don't copy readonly */ |