diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-16 21:35:52 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-16 21:35:52 +0000 |
| commit | d3667a2e2971a879194084f4b61b8ff7ff9765a2 (patch) | |
| tree | b4dcab4066674ba9bfa268bff3ee9b2be20aa320 /src/buffer.c | |
| parent | cf03447964a76bd37b14d208fc524f40a84f6e64 (diff) | |
| download | vim-git-d3667a2e2971a879194084f4b61b8ff7ff9765a2.tar.gz | |
updated for version 7.0226
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c index 44aac3453..7e848f6ff 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -3017,15 +3017,23 @@ maketitle() if (*p_titlestring != NUL) { #ifdef FEAT_STL_OPT - int use_sandbox = FALSE; + if (stl_syntax & STL_IN_TITLE) + { + int use_sandbox = FALSE; + int save_called_emsg = called_emsg; # ifdef FEAT_EVAL - use_sandbox = was_set_insecurely((char_u *)"titlestring", 0); + use_sandbox = was_set_insecurely((char_u *)"titlestring", 0); # endif - if (stl_syntax & STL_IN_TITLE) + called_emsg = FALSE; build_stl_str_hl(curwin, t_str, sizeof(buf), p_titlestring, use_sandbox, 0, maxlen, NULL, NULL); + if (called_emsg) + set_string_option_direct((char_u *)"titlestring", -1, + (char_u *)"", OPT_FREE, SID_ERROR); + called_emsg |= save_called_emsg; + } else #endif t_str = p_titlestring; @@ -3114,15 +3122,23 @@ maketitle() if (*p_iconstring != NUL) { #ifdef FEAT_STL_OPT - int use_sandbox = FALSE; + if (stl_syntax & STL_IN_ICON) + { + int use_sandbox = FALSE; + int save_called_emsg = called_emsg; # ifdef FEAT_EVAL - use_sandbox = was_set_insecurely((char_u *)"iconstring", 0); + use_sandbox = was_set_insecurely((char_u *)"iconstring", 0); # endif - if (stl_syntax & STL_IN_ICON) + called_emsg = FALSE; build_stl_str_hl(curwin, i_str, sizeof(buf), p_iconstring, use_sandbox, 0, 0, NULL, NULL); + if (called_emsg) + set_string_option_direct((char_u *)"iconstring", -1, + (char_u *)"", OPT_FREE, SID_ERROR); + called_emsg |= save_called_emsg; + } else #endif i_str = p_iconstring; |