Mercurial > vim

comparison src/insexpand.c @ 23272:a84e7abb0c92 v8.2.2182

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2182: Vim9: value of 'magic' is still relevant Commit: https://github.com/vim/vim/commit/f4e2099e39ed4d71aed0f9a9579455aed5ec6cc2 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Dec 21 19:59:08 2020 +0100 patch 8.2.2182: Vim9: value of 'magic' is still relevant Problem: Vim9: value of 'magic' is still relevant. Solution: Always behave like 'magic' is on in Vim9 script (closes https://github.com/vim/vim/issues/7509)
author Bram Moolenaar <Bram@vim.org>
date Mon, 21 Dec 2020 20:00:06 +0100
parents b545334ae654
children 1371e21fdc3d
comparison
equal deleted inserted replaced
23271:50ebb4982f37 23272:a84e7abb0c92
1214 vim_free(pat_esc); 1214 vim_free(pat_esc);
1215 vim_free(ptr); 1215 vim_free(ptr);
1216 } 1216 }
1217 else 1217 else
1218 { 1218 {
1219 regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0); 1219 regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0);
1220 if (regmatch.regprog == NULL) 1220 if (regmatch.regprog == NULL)
1221 goto theend; 1221 goto theend;
1222 } 1222 }
1223 1223
1224 // ignore case depends on 'ignorecase', 'smartcase' and "pat" 1224 // ignore case depends on 'ignorecase', 'smartcase' and "pat"
4173 if (ctrl_x_mode == CTRL_X_DICTIONARY 4173 if (ctrl_x_mode == CTRL_X_DICTIONARY
4174 || ctrl_x_mode == CTRL_X_THESAURUS) 4174 || ctrl_x_mode == CTRL_X_THESAURUS)
4175 break; 4175 break;
4176 // FALLTHROUGH 4176 // FALLTHROUGH
4177 case '~': 4177 case '~':
4178 if (!p_magic) // quote these only if magic is set 4178 if (!magic_isset()) // quote these only if magic is set
4179 break; 4179 break;
4180 // FALLTHROUGH 4180 // FALLTHROUGH
4181 case '\\': 4181 case '\\':
4182 if (ctrl_x_mode == CTRL_X_DICTIONARY 4182 if (ctrl_x_mode == CTRL_X_DICTIONARY
4183 || ctrl_x_mode == CTRL_X_THESAURUS) 4183 || ctrl_x_mode == CTRL_X_THESAURUS)